tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [09/45] tez git commit: TEZ-3019. Tez UI 2: Replace BaseURL with Host (sree)
Date Wed, 24 Feb 2016 22:40:48 GMT
TEZ-3019. Tez UI 2: Replace BaseURL with Host (sree)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/ec0a5927
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/ec0a5927
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/ec0a5927

Branch: refs/heads/master
Commit: ec0a5927a8e301e8a84f96ca71a33be5ab462dde
Parents: d6bb483
Author: Sreenath Somarajapuram <sree@apache.org>
Authored: Tue Dec 29 23:00:20 2015 +0530
Committer: Sreenath Somarajapuram <sree@apache.org>
Committed: Thu Feb 25 03:31:59 2016 +0530

----------------------------------------------------------------------
 TEZ-2980-CHANGES.txt                                |  1 +
 tez-ui2/src/main/webapp/app/services/hosts.js       |  8 ++++----
 .../src/main/webapp/app/templates/application.hbs   |  4 +++-
 tez-ui2/src/main/webapp/config/configs.env          |  4 ++--
 .../main/webapp/tests/unit/services/hosts-test.js   | 16 ++++++++--------
 5 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/ec0a5927/TEZ-2980-CHANGES.txt
----------------------------------------------------------------------
diff --git a/TEZ-2980-CHANGES.txt b/TEZ-2980-CHANGES.txt
index e792420..5143309 100644
--- a/TEZ-2980-CHANGES.txt
+++ b/TEZ-2980-CHANGES.txt
@@ -3,3 +3,4 @@ ALL CHANGES:
   TEZ-3016. Tez UI 2: Make bower dependency silent
   TEZ-2983. Tez UI 2: Get ember initializers functional
   TEZ-3018. Tez UI 2: Add config.env
+  TEZ-3019. Tez UI 2: Replace BaseURL with Host

http://git-wip-us.apache.org/repos/asf/tez/blob/ec0a5927/tez-ui2/src/main/webapp/app/services/hosts.js
----------------------------------------------------------------------
diff --git a/tez-ui2/src/main/webapp/app/services/hosts.js b/tez-ui2/src/main/webapp/app/services/hosts.js
index 7ffdc29..f549f2c 100644
--- a/tez-ui2/src/main/webapp/app/services/hosts.js
+++ b/tez-ui2/src/main/webapp/app/services/hosts.js
@@ -54,14 +54,14 @@ export default Ember.Service.extend({
     return url;
   },
 
-  timelineBaseURL: Ember.computed(function () {
+  timeline: Ember.computed(function () {
     var ENV = window.ENV;
-    return this.normalizeURL((ENV && ENV.timelineBaseURL) || environment.hosts.timeline);
+    return this.normalizeURL((ENV && ENV.timelineHost) || environment.hosts.timeline);
   }),
 
-  rmBaseURL: Ember.computed(function () {
+  rm: Ember.computed(function () {
     var ENV = window.ENV;
-    return this.normalizeURL((ENV && ENV.rmBaseURL) || environment.hosts.RM);
+    return this.normalizeURL((ENV && ENV.rmHost) || environment.hosts.RM);
   }),
 
 });

http://git-wip-us.apache.org/repos/asf/tez/blob/ec0a5927/tez-ui2/src/main/webapp/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/tez-ui2/src/main/webapp/app/templates/application.hbs b/tez-ui2/src/main/webapp/app/templates/application.hbs
index c1c380d..d1154b1 100644
--- a/tez-ui2/src/main/webapp/app/templates/application.hbs
+++ b/tez-ui2/src/main/webapp/app/templates/application.hbs
@@ -20,4 +20,6 @@
 
 {{outlet}}
 
-{{hosts.timelineBaseURL}}
+Timeline: {{hosts.timeline}}
+<br/>
+RM: {{hosts.rm}}

http://git-wip-us.apache.org/repos/asf/tez/blob/ec0a5927/tez-ui2/src/main/webapp/config/configs.env
----------------------------------------------------------------------
diff --git a/tez-ui2/src/main/webapp/config/configs.env b/tez-ui2/src/main/webapp/config/configs.env
index 6e12286..5f5ec17 100644
--- a/tez-ui2/src/main/webapp/config/configs.env
+++ b/tez-ui2/src/main/webapp/config/configs.env
@@ -1,4 +1,4 @@
 ENV = {
-  //timelineBaseURL: "http://localhost:8188",
-  //rmBaseURL: "http://localhost:8088"
+  //timelineHost: "http://localhost:8188",
+  //rmHost: "http://localhost:8088"
 };

http://git-wip-us.apache.org/repos/asf/tez/blob/ec0a5927/tez-ui2/src/main/webapp/tests/unit/services/hosts-test.js
----------------------------------------------------------------------
diff --git a/tez-ui2/src/main/webapp/tests/unit/services/hosts-test.js b/tez-ui2/src/main/webapp/tests/unit/services/hosts-test.js
index b130a2c..51b558c 100644
--- a/tez-ui2/src/main/webapp/tests/unit/services/hosts-test.js
+++ b/tez-ui2/src/main/webapp/tests/unit/services/hosts-test.js
@@ -57,20 +57,20 @@ test('Test correctProtocol with protocol=file:', function(assert) {
   assert.equal(service.correctProtocol("https://localhost:8088", "file:"), "https://localhost:8088");
 });
 
-test('Test base URLs', function(assert) {
+test('Test host URLs', function(assert) {
   let service = this.subject();
 
-  assert.equal(service.get("timelineBaseURL"), "http://localhost:8188");
-  assert.equal(service.get("rmBaseURL"), "http://localhost:8088");
+  assert.equal(service.get("timeline"), "http://localhost:8188");
+  assert.equal(service.get("rm"), "http://localhost:8088");
 });
 
-test('Test base URLs with ENV set', function(assert) {
+test('Test host URLs with ENV set', function(assert) {
   let service = this.subject();
 
   window.ENV = {
-    timelineBaseURL: "https://localhost:3333",
-    rmBaseURL: "https://localhost:4444"
+    timelineHost: "https://localhost:3333",
+    rmHost: "https://localhost:4444"
   };
-  assert.equal(service.get("timelineBaseURL"), "http://localhost:3333");
-  assert.equal(service.get("rmBaseURL"), "http://localhost:4444");
+  assert.equal(service.get("timeline"), "http://localhost:3333");
+  assert.equal(service.get("rm"), "http://localhost:4444");
 });


Mime
View raw message