diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index cbde295ec050..5d38489f340f 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -279,7 +279,7 @@ true - + maven-resources-plugin @@ -295,7 +295,7 @@ true - ../hbase-server/src/main/resources/hbase-webapps/static + ../hbase-server/target/hbase-webapps/static diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 0ce488ba3c4c..dc51db0f8f5f 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -752,7 +752,9 @@ + org.apache.maven.plugins maven-dependency-plugin + ${maven.dependency.version} create-mrapp-generated-classpath @@ -768,6 +770,108 @@ ${project.build.directory}/test-classes/mrapp-generated-classpath + + unpack-ui-resources-js + + unpack + + process-resources + + + + org.webjars + bootstrap + ${bootstrap.version} + jar + true + **/js/bootstrap.min.js + + + + + + org.webjars + jquery + ${jquery.version} + jar + true + **/jquery.min.js + + + + + + org.webjars + tablesorter + ${tablesorter.version} + jar + true + **/jquery.tablesorter.min.js, + **/parsers/parser-date-iso8601.min.js + + + + + + org.webjars + vega + ${vega.version} + jar + true + **/vega.min.js + + + + + + org.webjars + vega-embed + ${vega-embed.version} + jar + true + **/vega-embed.min.js + + + + + + org.webjars + vega-lite + ${vega-lite.version} + jar + true + **/vega-lite.min.js + + + + + + ${project.build.directory}/hbase-webapps/static/js + + + + unpack-ui-resources-css + + unpack + + process-resources + + + + org.webjars + bootstrap + ${bootstrap.version} + jar + true + **/css/bootstrap.min.css + + + + + + ${project.build.directory}/hbase-webapps/static/css + + diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon index 0b7b0c081ca2..9a98cfefed7f 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/RegionVisualizerTmpl.jamon @@ -17,9 +17,9 @@ See the License for the specific language governing permissions and limitations under the License. - - - + + +