From 8608f726d325f9d3b6876ffe0cde81398b463ecd Mon Sep 17 00:00:00 2001 From: Vikhyat Korrapati Date: Fri, 24 Apr 2015 17:10:56 +0530 Subject: [PATCH] [FLINK-1938] Add Grunt for building the front-end --- .gitignore | 3 ++ LICENSE | 2 +- flink-dist/src/main/flink-bin/LICENSE | 2 +- flink-runtime/pom.xml | 39 ++++++++++++++++++ flink-runtime/src/main/frontend/Gruntfile.js | 30 ++++++++++++++ .../analyze.html | 0 .../blank-page.html | 0 .../configuration.html | 0 .../css/bootstrap.css | 0 .../css/bootstrap.css.map | 0 .../css/bootstrap.min.css | 0 .../css/nephelefrontend.css | 0 .../css/rickshaw.min.css | 0 .../css/sb-admin.css | 0 .../css/timeline.css | 0 .../font-awesome/css/font-awesome.css | 0 .../font-awesome/css/font-awesome.min.css | 0 .../font-awesome/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../font-awesome/less/bordered-pulled.less | 0 .../font-awesome/less/core.less | 0 .../font-awesome/less/fixed-width.less | 0 .../font-awesome/less/font-awesome.less | 0 .../font-awesome/less/icons.less | 0 .../font-awesome/less/larger.less | 0 .../font-awesome/less/list.less | 0 .../font-awesome/less/mixins.less | 0 .../font-awesome/less/path.less | 0 .../font-awesome/less/rotated-flipped.less | 0 .../font-awesome/less/spinning.less | 0 .../font-awesome/less/stacked.less | 0 .../font-awesome/less/variables.less | 0 .../font-awesome/scss/_bordered-pulled.scss | 0 .../font-awesome/scss/_core.scss | 0 .../font-awesome/scss/_fixed-width.scss | 0 .../font-awesome/scss/_icons.scss | 0 .../font-awesome/scss/_larger.scss | 0 .../font-awesome/scss/_list.scss | 0 .../font-awesome/scss/_mixins.scss | 0 .../font-awesome/scss/_path.scss | 0 .../font-awesome/scss/_rotated-flipped.scss | 0 .../font-awesome/scss/_spinning.scss | 0 .../font-awesome/scss/_stacked.scss | 0 .../font-awesome/scss/_variables.scss | 0 .../font-awesome/scss/font-awesome.scss | 0 .../history.html | 0 .../img/flink-logo.png | Bin .../index.html | 0 .../js/analyzer.js | 0 .../js/bootstrap.js | 0 .../js/configuration.js | 0 .../js/d3.layout.min.js | 0 .../js/d3.min.js | 0 .../js/helpers.js | 0 .../js/jcanvas.min.js | 0 .../js/jobmanagerFrontend.js | 0 .../js/jquery-2.1.0.js | 0 .../js/rickshaw.min.js | 0 .../js/taskmanager.js | 0 .../js/timeline.js | 0 flink-runtime/src/main/frontend/package.json | 9 ++++ .../taskmanagers.html | 0 pom.xml | 20 +++++---- 66 files changed, 95 insertions(+), 10 deletions(-) create mode 100644 flink-runtime/src/main/frontend/Gruntfile.js rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/analyze.html (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/blank-page.html (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/configuration.html (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/css/bootstrap.css (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/css/bootstrap.css.map (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/css/bootstrap.min.css (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/css/nephelefrontend.css (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/css/rickshaw.min.css (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/css/sb-admin.css (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/css/timeline.css (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/css/font-awesome.css (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/css/font-awesome.min.css (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/fonts/FontAwesome.otf (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/fonts/fontawesome-webfont.eot (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/fonts/fontawesome-webfont.svg (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/fonts/fontawesome-webfont.ttf (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/fonts/fontawesome-webfont.woff (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/bordered-pulled.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/core.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/fixed-width.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/font-awesome.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/icons.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/larger.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/list.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/mixins.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/path.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/rotated-flipped.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/spinning.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/stacked.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/less/variables.less (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/_bordered-pulled.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/_core.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/_fixed-width.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/_icons.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/_larger.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/_list.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/_mixins.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/_path.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/_rotated-flipped.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/_spinning.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/_stacked.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/_variables.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/font-awesome/scss/font-awesome.scss (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/history.html (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/img/flink-logo.png (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/index.html (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/js/analyzer.js (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/js/bootstrap.js (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/js/configuration.js (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/js/d3.layout.min.js (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/js/d3.min.js (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/js/helpers.js (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/js/jcanvas.min.js (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/js/jobmanagerFrontend.js (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/js/jquery-2.1.0.js (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/js/rickshaw.min.js (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/js/taskmanager.js (100%) rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/js/timeline.js (100%) create mode 100644 flink-runtime/src/main/frontend/package.json rename flink-runtime/src/main/{resources/web-docs-infoserver => frontend}/taskmanagers.html (100%) diff --git a/.gitignore b/.gitignore index 36d98e6cb5885..db4a939764872 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,7 @@ _site docs/api build-target flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/generated/ +flink-runtime/src/main/frontend/node_modules/ +flink-runtime/src/main/frontend/node/ +flink-runtime/src/main/frontend/build/ atlassian-ide-plugin.xml diff --git a/LICENSE b/LICENSE index dc814132b2a7c..2c2be021ff1e3 100644 --- a/LICENSE +++ b/LICENSE @@ -296,5 +296,5 @@ The Apache Flink project bundles the following fonts under the Open Font License (OFT) - http://scripts.sil.org/OFL/ - Font Awesome (http://fortawesome.github.io/Font-Awesome/) - Created by Dave Gandy - -> fonts in "flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts" + -> fonts in "flink-runtime/src/main/frontend/font-awesome/fonts" diff --git a/flink-dist/src/main/flink-bin/LICENSE b/flink-dist/src/main/flink-bin/LICENSE index d66922cd2085d..1ddcac91bd723 100644 --- a/flink-dist/src/main/flink-bin/LICENSE +++ b/flink-dist/src/main/flink-bin/LICENSE @@ -362,7 +362,7 @@ The Apache Flink project bundles the following fonts under the Open Font License (OFT) - http://scripts.sil.org/OFL/ - Font Awesome (http://fortawesome.github.io/Font-Awesome/) - Created by Dave Gandy - -> fonts in "flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts" + -> fonts in "flink-runtime/src/main/frontend/font-awesome/fonts" ----------------------------------------------------------------------- diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml index 05f22a59917a0..4443e53d38b72 100644 --- a/flink-runtime/pom.xml +++ b/flink-runtime/pom.xml @@ -366,6 +366,45 @@ under the License. + + + com.github.eirslett + frontend-maven-plugin + 0.0.23 + + src/main/frontend + + + + install node and npm + + install-node-and-npm + + + v0.10.32 + 2.1.6 + + + + npm install + + npm + + + + grunt build + + grunt + + + + + + + src/main/frontend/build + web-docs-infoserver + + diff --git a/flink-runtime/src/main/frontend/Gruntfile.js b/flink-runtime/src/main/frontend/Gruntfile.js new file mode 100644 index 0000000000000..36ee2c71b9aa7 --- /dev/null +++ b/flink-runtime/src/main/frontend/Gruntfile.js @@ -0,0 +1,30 @@ +var buildDir= 'build/'; + +module.exports = function(grunt) { + + grunt.initConfig({ + pkg: grunt.file.readJSON('package.json'), + + copy: { + main: { + files: [ + {expand: true, src: '*.html', dest: buildDir}, + {expand: true, src: 'css/**', dest: buildDir}, + {expand: true, src: 'font-awesome/**', dest: buildDir}, + {expand: true, src: 'img/**', dest: buildDir}, + {expand: true, src: 'js/**', dest: buildDir} + ] + } + }, + + clean: { + build: [buildDir] + } + }); + + grunt.loadNpmTasks('grunt-contrib-copy'); + grunt.loadNpmTasks('grunt-contrib-clean'); + + grunt.registerTask('default', ['clean:build', 'copy:main']); + +}; diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/analyze.html b/flink-runtime/src/main/frontend/analyze.html similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/analyze.html rename to flink-runtime/src/main/frontend/analyze.html diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/blank-page.html b/flink-runtime/src/main/frontend/blank-page.html similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/blank-page.html rename to flink-runtime/src/main/frontend/blank-page.html diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/configuration.html b/flink-runtime/src/main/frontend/configuration.html similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/configuration.html rename to flink-runtime/src/main/frontend/configuration.html diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/css/bootstrap.css b/flink-runtime/src/main/frontend/css/bootstrap.css similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/css/bootstrap.css rename to flink-runtime/src/main/frontend/css/bootstrap.css diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/css/bootstrap.css.map b/flink-runtime/src/main/frontend/css/bootstrap.css.map similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/css/bootstrap.css.map rename to flink-runtime/src/main/frontend/css/bootstrap.css.map diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/css/bootstrap.min.css b/flink-runtime/src/main/frontend/css/bootstrap.min.css similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/css/bootstrap.min.css rename to flink-runtime/src/main/frontend/css/bootstrap.min.css diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/css/nephelefrontend.css b/flink-runtime/src/main/frontend/css/nephelefrontend.css similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/css/nephelefrontend.css rename to flink-runtime/src/main/frontend/css/nephelefrontend.css diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/css/rickshaw.min.css b/flink-runtime/src/main/frontend/css/rickshaw.min.css similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/css/rickshaw.min.css rename to flink-runtime/src/main/frontend/css/rickshaw.min.css diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/css/sb-admin.css b/flink-runtime/src/main/frontend/css/sb-admin.css similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/css/sb-admin.css rename to flink-runtime/src/main/frontend/css/sb-admin.css diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/css/timeline.css b/flink-runtime/src/main/frontend/css/timeline.css similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/css/timeline.css rename to flink-runtime/src/main/frontend/css/timeline.css diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/css/font-awesome.css b/flink-runtime/src/main/frontend/font-awesome/css/font-awesome.css similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/css/font-awesome.css rename to flink-runtime/src/main/frontend/font-awesome/css/font-awesome.css diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/css/font-awesome.min.css b/flink-runtime/src/main/frontend/font-awesome/css/font-awesome.min.css similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/css/font-awesome.min.css rename to flink-runtime/src/main/frontend/font-awesome/css/font-awesome.min.css diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts/FontAwesome.otf b/flink-runtime/src/main/frontend/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts/FontAwesome.otf rename to flink-runtime/src/main/frontend/font-awesome/fonts/FontAwesome.otf diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.eot b/flink-runtime/src/main/frontend/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.eot rename to flink-runtime/src/main/frontend/font-awesome/fonts/fontawesome-webfont.eot diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.svg b/flink-runtime/src/main/frontend/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.svg rename to flink-runtime/src/main/frontend/font-awesome/fonts/fontawesome-webfont.svg diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.ttf b/flink-runtime/src/main/frontend/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.ttf rename to flink-runtime/src/main/frontend/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.woff b/flink-runtime/src/main/frontend/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/fonts/fontawesome-webfont.woff rename to flink-runtime/src/main/frontend/font-awesome/fonts/fontawesome-webfont.woff diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/bordered-pulled.less b/flink-runtime/src/main/frontend/font-awesome/less/bordered-pulled.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/bordered-pulled.less rename to flink-runtime/src/main/frontend/font-awesome/less/bordered-pulled.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/core.less b/flink-runtime/src/main/frontend/font-awesome/less/core.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/core.less rename to flink-runtime/src/main/frontend/font-awesome/less/core.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/fixed-width.less b/flink-runtime/src/main/frontend/font-awesome/less/fixed-width.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/fixed-width.less rename to flink-runtime/src/main/frontend/font-awesome/less/fixed-width.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/font-awesome.less b/flink-runtime/src/main/frontend/font-awesome/less/font-awesome.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/font-awesome.less rename to flink-runtime/src/main/frontend/font-awesome/less/font-awesome.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/icons.less b/flink-runtime/src/main/frontend/font-awesome/less/icons.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/icons.less rename to flink-runtime/src/main/frontend/font-awesome/less/icons.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/larger.less b/flink-runtime/src/main/frontend/font-awesome/less/larger.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/larger.less rename to flink-runtime/src/main/frontend/font-awesome/less/larger.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/list.less b/flink-runtime/src/main/frontend/font-awesome/less/list.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/list.less rename to flink-runtime/src/main/frontend/font-awesome/less/list.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/mixins.less b/flink-runtime/src/main/frontend/font-awesome/less/mixins.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/mixins.less rename to flink-runtime/src/main/frontend/font-awesome/less/mixins.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/path.less b/flink-runtime/src/main/frontend/font-awesome/less/path.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/path.less rename to flink-runtime/src/main/frontend/font-awesome/less/path.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/rotated-flipped.less b/flink-runtime/src/main/frontend/font-awesome/less/rotated-flipped.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/rotated-flipped.less rename to flink-runtime/src/main/frontend/font-awesome/less/rotated-flipped.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/spinning.less b/flink-runtime/src/main/frontend/font-awesome/less/spinning.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/spinning.less rename to flink-runtime/src/main/frontend/font-awesome/less/spinning.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/stacked.less b/flink-runtime/src/main/frontend/font-awesome/less/stacked.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/stacked.less rename to flink-runtime/src/main/frontend/font-awesome/less/stacked.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/variables.less b/flink-runtime/src/main/frontend/font-awesome/less/variables.less similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/less/variables.less rename to flink-runtime/src/main/frontend/font-awesome/less/variables.less diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_bordered-pulled.scss b/flink-runtime/src/main/frontend/font-awesome/scss/_bordered-pulled.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_bordered-pulled.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/_bordered-pulled.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_core.scss b/flink-runtime/src/main/frontend/font-awesome/scss/_core.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_core.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/_core.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_fixed-width.scss b/flink-runtime/src/main/frontend/font-awesome/scss/_fixed-width.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_fixed-width.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/_fixed-width.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_icons.scss b/flink-runtime/src/main/frontend/font-awesome/scss/_icons.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_icons.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/_icons.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_larger.scss b/flink-runtime/src/main/frontend/font-awesome/scss/_larger.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_larger.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/_larger.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_list.scss b/flink-runtime/src/main/frontend/font-awesome/scss/_list.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_list.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/_list.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_mixins.scss b/flink-runtime/src/main/frontend/font-awesome/scss/_mixins.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_mixins.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/_mixins.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_path.scss b/flink-runtime/src/main/frontend/font-awesome/scss/_path.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_path.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/_path.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_rotated-flipped.scss b/flink-runtime/src/main/frontend/font-awesome/scss/_rotated-flipped.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_rotated-flipped.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/_rotated-flipped.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_spinning.scss b/flink-runtime/src/main/frontend/font-awesome/scss/_spinning.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_spinning.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/_spinning.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_stacked.scss b/flink-runtime/src/main/frontend/font-awesome/scss/_stacked.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_stacked.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/_stacked.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_variables.scss b/flink-runtime/src/main/frontend/font-awesome/scss/_variables.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/_variables.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/_variables.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/font-awesome.scss b/flink-runtime/src/main/frontend/font-awesome/scss/font-awesome.scss similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/font-awesome/scss/font-awesome.scss rename to flink-runtime/src/main/frontend/font-awesome/scss/font-awesome.scss diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/history.html b/flink-runtime/src/main/frontend/history.html similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/history.html rename to flink-runtime/src/main/frontend/history.html diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/img/flink-logo.png b/flink-runtime/src/main/frontend/img/flink-logo.png similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/img/flink-logo.png rename to flink-runtime/src/main/frontend/img/flink-logo.png diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/index.html b/flink-runtime/src/main/frontend/index.html similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/index.html rename to flink-runtime/src/main/frontend/index.html diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/analyzer.js b/flink-runtime/src/main/frontend/js/analyzer.js similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/js/analyzer.js rename to flink-runtime/src/main/frontend/js/analyzer.js diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/bootstrap.js b/flink-runtime/src/main/frontend/js/bootstrap.js similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/js/bootstrap.js rename to flink-runtime/src/main/frontend/js/bootstrap.js diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/configuration.js b/flink-runtime/src/main/frontend/js/configuration.js similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/js/configuration.js rename to flink-runtime/src/main/frontend/js/configuration.js diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/d3.layout.min.js b/flink-runtime/src/main/frontend/js/d3.layout.min.js similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/js/d3.layout.min.js rename to flink-runtime/src/main/frontend/js/d3.layout.min.js diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/d3.min.js b/flink-runtime/src/main/frontend/js/d3.min.js similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/js/d3.min.js rename to flink-runtime/src/main/frontend/js/d3.min.js diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/helpers.js b/flink-runtime/src/main/frontend/js/helpers.js similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/js/helpers.js rename to flink-runtime/src/main/frontend/js/helpers.js diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/jcanvas.min.js b/flink-runtime/src/main/frontend/js/jcanvas.min.js similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/js/jcanvas.min.js rename to flink-runtime/src/main/frontend/js/jcanvas.min.js diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/jobmanagerFrontend.js b/flink-runtime/src/main/frontend/js/jobmanagerFrontend.js similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/js/jobmanagerFrontend.js rename to flink-runtime/src/main/frontend/js/jobmanagerFrontend.js diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/jquery-2.1.0.js b/flink-runtime/src/main/frontend/js/jquery-2.1.0.js similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/js/jquery-2.1.0.js rename to flink-runtime/src/main/frontend/js/jquery-2.1.0.js diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/rickshaw.min.js b/flink-runtime/src/main/frontend/js/rickshaw.min.js similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/js/rickshaw.min.js rename to flink-runtime/src/main/frontend/js/rickshaw.min.js diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/taskmanager.js b/flink-runtime/src/main/frontend/js/taskmanager.js similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/js/taskmanager.js rename to flink-runtime/src/main/frontend/js/taskmanager.js diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/js/timeline.js b/flink-runtime/src/main/frontend/js/timeline.js similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/js/timeline.js rename to flink-runtime/src/main/frontend/js/timeline.js diff --git a/flink-runtime/src/main/frontend/package.json b/flink-runtime/src/main/frontend/package.json new file mode 100644 index 0000000000000..deeb77a0b623e --- /dev/null +++ b/flink-runtime/src/main/frontend/package.json @@ -0,0 +1,9 @@ +{ + "name": "flink-ui", + "devDependencies": { + "grunt": "^0.4.5", + "grunt-cli": "^0.1.13", + "grunt-contrib-clean": "^0.6.0", + "grunt-contrib-copy": "^0.8.0" + } +} diff --git a/flink-runtime/src/main/resources/web-docs-infoserver/taskmanagers.html b/flink-runtime/src/main/frontend/taskmanagers.html similarity index 100% rename from flink-runtime/src/main/resources/web-docs-infoserver/taskmanagers.html rename to flink-runtime/src/main/frontend/taskmanagers.html diff --git a/pom.xml b/pom.xml index eb73b3b842814..9feb5bac69f66 100644 --- a/pom.xml +++ b/pom.xml @@ -702,14 +702,18 @@ under the License. **/resources/**/jquery* **/resources/**/bootstrap* flink-clients/src/main/resources/web-docs/js/*d3.js - flink-runtime/src/main/resources/web-docs-infoserver/css/sb-admin.css - flink-runtime/src/main/resources/web-docs-infoserver/js/flot/* - flink-runtime/src/main/resources/web-docs-infoserver/js/jcanvas.min.js - flink-runtime/src/main/resources/web-docs-infoserver/js/timeline.js - flink-runtime/src/main/resources/web-docs-infoserver/js/d3.min.js - flink-runtime/src/main/resources/web-docs-infoserver/js/d3.layout.min.js - flink-runtime/src/main/resources/web-docs-infoserver/js/rickshaw.* - flink-runtime/src/main/resources/web-docs-infoserver/css/rickshaw.* + flink-runtime/src/main/frontend/css/sb-admin.css + flink-runtime/src/main/frontend/node/** + flink-runtime/src/main/frontend/font-awesome/** + flink-runtime/src/main/frontend/build/** + flink-runtime/src/main/frontend/node_modules/** + flink-runtime/src/main/frontend/js/flot/* + flink-runtime/src/main/frontend/js/jcanvas.min.js + flink-runtime/src/main/frontend/js/timeline.js + flink-runtime/src/main/frontend/js/d3.min.js + flink-runtime/src/main/frontend/js/d3.layout.min.js + flink-runtime/src/main/frontend/js/rickshaw.* + flink-runtime/src/main/frontend/css/rickshaw.* flink-tests/src/test/resources/testdata/terainput.txt flink-staging/flink-avro/src/test/resources/avro/*.avsc