Repository: tez Updated Branches: refs/heads/TEZ-2980 1387b7a6c -> 852247b3d
TEZ-3070. Tez UI 2: Jenkins build is failing (sree) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/852247b3 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/852247b3 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/852247b3 Branch: refs/heads/TEZ-2980 Commit: 852247b3df0fab78afd18b7d830f482ca8f3da34 Parents: 1387b7a Author: Sreenath Somarajapuram <s...@apache.org> Authored: Sat Jan 23 02:26:22 2016 +0530 Committer: Sreenath Somarajapuram <s...@apache.org> Committed: Sat Jan 23 02:26:22 2016 +0530 ---------------------------------------------------------------------- TEZ-2980-CHANGES.txt | 1 + tez-ui2/README.md | 4 ++++ tez-ui2/src/main/webapp/app/styles/column-selector.less | 4 ++-- tez-ui2/src/main/webapp/app/styles/page-layout.less | 2 +- tez-ui2/src/main/webapp/bower.json | 4 ++-- tez-ui2/src/main/webapp/ember-cli-build.js | 4 ++++ tez-ui2/src/main/webapp/package.json | 4 ++-- 7 files changed, 16 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/852247b3/TEZ-2980-CHANGES.txt ---------------------------------------------------------------------- diff --git a/TEZ-2980-CHANGES.txt b/TEZ-2980-CHANGES.txt index e413bc3..f5660a5 100644 --- a/TEZ-2980-CHANGES.txt +++ b/TEZ-2980-CHANGES.txt @@ -25,3 +25,4 @@ ALL CHANGES: TEZ-3050. Tez UI 2: Add counter columns TEZ-3064. Tez UI 2: Add All DAGs filters TEZ-3059. Tez UI 2: Make refresh functional + TEZ-3070. Tez UI 2: Jenkins build is failing http://git-wip-us.apache.org/repos/asf/tez/blob/852247b3/tez-ui2/README.md ---------------------------------------------------------------------- diff --git a/tez-ui2/README.md b/tez-ui2/README.md index e4ce2f5..3ec46de 100644 --- a/tez-ui2/README.md +++ b/tez-ui2/README.md @@ -20,6 +20,10 @@ You will need the following things properly installed on your computer. * In tez/tez-ui2/src/main/webapp * `npm install` +## Configuring +* By default timeline is expected at localhost:8188 & RM at localhost:8088 +* You can point the UI to custom locations by setting the environment variables in src/main/webapp/config/configs.env + ## Running / Development * `ember server` http://git-wip-us.apache.org/repos/asf/tez/blob/852247b3/tez-ui2/src/main/webapp/app/styles/column-selector.less ---------------------------------------------------------------------- diff --git a/tez-ui2/src/main/webapp/app/styles/column-selector.less b/tez-ui2/src/main/webapp/app/styles/column-selector.less index 3e061e1..c83bdde 100644 --- a/tez-ui2/src/main/webapp/app/styles/column-selector.less +++ b/tez-ui2/src/main/webapp/app/styles/column-selector.less @@ -16,8 +16,8 @@ * limitations under the License. */ -@import "../../bower_components/snippet-ss/less/force"; -@import "../../bower_components/snippet-ss/less/effects"; +@import "bower_components/snippet-ss/less/force"; +@import "bower_components/snippet-ss/less/effects"; .column-selector { .message { http://git-wip-us.apache.org/repos/asf/tez/blob/852247b3/tez-ui2/src/main/webapp/app/styles/page-layout.less ---------------------------------------------------------------------- diff --git a/tez-ui2/src/main/webapp/app/styles/page-layout.less b/tez-ui2/src/main/webapp/app/styles/page-layout.less index 5a49abc..0411fa0 100644 --- a/tez-ui2/src/main/webapp/app/styles/page-layout.less +++ b/tez-ui2/src/main/webapp/app/styles/page-layout.less @@ -17,7 +17,7 @@ */ @import "colors"; -@import "../../bower_components/snippet-ss/less/no"; +@import "bower_components/snippet-ss/less/no"; body, html, body > .ember-view { height: 100%; http://git-wip-us.apache.org/repos/asf/tez/blob/852247b3/tez-ui2/src/main/webapp/bower.json ---------------------------------------------------------------------- diff --git a/tez-ui2/src/main/webapp/bower.json b/tez-ui2/src/main/webapp/bower.json index 1448fd3..eb9569d 100644 --- a/tez-ui2/src/main/webapp/bower.json +++ b/tez-ui2/src/main/webapp/bower.json @@ -12,11 +12,11 @@ "qunit": "~1.19.0", "more-js": "*", "bootstrap": "~3.3.5", - "snippet-ss": "*", "font-awesome": "~4.5.0", "jquery-ui": "1.11.4", "moment": "^2.8.0", "moment-timezone": "^0.5.0", - "numeral": "1.5.3" + "numeral": "1.5.3", + "snippet-ss": "~1.11.0" } } http://git-wip-us.apache.org/repos/asf/tez/blob/852247b3/tez-ui2/src/main/webapp/ember-cli-build.js ---------------------------------------------------------------------- diff --git a/tez-ui2/src/main/webapp/ember-cli-build.js b/tez-ui2/src/main/webapp/ember-cli-build.js index dee919b..d5cd31a 100644 --- a/tez-ui2/src/main/webapp/ember-cli-build.js +++ b/tez-ui2/src/main/webapp/ember-cli-build.js @@ -33,6 +33,10 @@ module.exports = function(defaults) { destDir: '/config' }); + app.import("bower_components/snippet-ss/less/force.less"); + app.import("bower_components/snippet-ss/less/effects.less"); + app.import("bower_components/snippet-ss/less/no.less"); + app.import('bower_components/bootstrap/dist/js/bootstrap.js'); app.import('bower_components/jquery-ui/jquery-ui.js'); app.import('bower_components/jquery-ui/ui/tooltip.js'); http://git-wip-us.apache.org/repos/asf/tez/blob/852247b3/tez-ui2/src/main/webapp/package.json ---------------------------------------------------------------------- diff --git a/tez-ui2/src/main/webapp/package.json b/tez-ui2/src/main/webapp/package.json index ec84b18..f484913 100644 --- a/tez-ui2/src/main/webapp/package.json +++ b/tez-ui2/src/main/webapp/package.json @@ -48,8 +48,8 @@ }, "dependencies": { "broccoli-funnel": "^1.0.1", - "em-helpers": "0.5.7", - "em-table": "0.3.7", + "em-helpers": "0.5.8", + "em-table": "0.3.8", "ember-cli-htmlbars": "^1.0.1", "ember-cli-less": "^1.4.0", "phantomjs": "^1.9.19"