You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by mo...@apache.org on 2018/04/26 14:38:43 UTC
knox git commit: KNOX-1264 - Fix job link under the jobHistoryUI
(Sunil Govind via Sandeep)
Repository: knox
Updated Branches:
refs/heads/master c25abaf01 -> 1e7fc7127
KNOX-1264 - Fix job link under the jobHistoryUI (Sunil Govind via Sandeep)
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/1e7fc712
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/1e7fc712
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/1e7fc712
Branch: refs/heads/master
Commit: 1e7fc7127a1682014c1e98119d9ccbce0602c4b9
Parents: c25abaf
Author: Sandeep More <mo...@apache.org>
Authored: Thu Apr 26 10:38:34 2018 -0400
Committer: Sandeep More <mo...@apache.org>
Committed: Thu Apr 26 10:38:34 2018 -0400
----------------------------------------------------------------------
.../main/resources/services/jobhistoryui/2.7.0/rewrite.xml | 7 +++++--
.../main/resources/services/jobhistoryui/2.7.0/service.xml | 3 +++
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/1e7fc712/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/rewrite.xml b/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/rewrite.xml
index 2616881..7c81fe6 100644
--- a/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/rewrite.xml
+++ b/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/rewrite.xml
@@ -75,6 +75,9 @@
<rewrite template="{scheme}://{host}:{port}/node?{scheme}?{host}?{port}"/>
</rule>
+ <rule dir="IN" name="JOBHISTORYUI/jobhistory/inbound/node" pattern="*://*:*/**/jobhistory/node?{host}&{port=**}">
+ <rewrite template="http://{host}:{port=**}/node"/>
+ </rule>
<!-- request out web content rewrite rules -->
@@ -157,9 +160,9 @@
<rule dir="OUT" name="JOBHISTORYUI/jobhistory/outbound/jobs/logs">
<rewrite template="{$frontend[url]}/jobhistory/joblogs"/>
</rule>
+
<rule dir="OUT" name="JOBHISTORYUI/jobhistory/outbound/jobs/node">
<match pattern="{scheme}://{host}:{port}"/>
- <rewrite template="{$frontend[scheme]}://{$frontend[address]}/gateway/nodemanagerui/node?host={host}"/>
+ <rewrite template="{$frontend[url]}/jobhistory/node?{host}?{port}"/>
</rule>
-
</rules>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/1e7fc712/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/service.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/service.xml b/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/service.xml
index 4594c01..4185db6 100644
--- a/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/service.xml
+++ b/gateway-service-definitions/src/main/resources/services/jobhistoryui/2.7.0/service.xml
@@ -32,5 +32,8 @@
<route path="/jobhistory/conf">
<rewrite apply="JOBHISTORYUI/jobhistory/outbound/configuration" to="response.body"/>
</route>
+ <route path="/jobhistory/node?**">
+ <rewrite apply="JOBHISTORYUI/jobhistory/inbound/node" to="request.url"/>
+ </route>
</routes>
</service>