knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pzamp...@apache.org
Subject knox git commit: KNOX-1160 - Bug fixes to make spark history UI work (Wei Han via pzampino)
Date Tue, 08 May 2018 20:03:28 GMT
Repository: knox
Updated Branches:
  refs/heads/master b509532d1 -> bf3fc5eb0


KNOX-1160 - Bug fixes to make spark history UI work (Wei Han via pzampino)


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

Branch: refs/heads/master
Commit: bf3fc5eb09cfb7db53f83f10b6dbbfdbe1dbe1f6
Parents: b509532
Author: Phil Zampino <pzampino@apache.org>
Authored: Tue May 8 15:30:48 2018 -0400
Committer: Phil Zampino <pzampino@apache.org>
Committed: Tue May 8 15:30:48 2018 -0400

----------------------------------------------------------------------
 .../services/sparkhistoryui/1.4.0/rewrite.xml   | 52 +++++++++++++++++++-
 .../services/sparkhistoryui/1.4.0/service.xml   |  6 +++
 2 files changed, 57 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/bf3fc5eb/gateway-service-definitions/src/main/resources/services/sparkhistoryui/1.4.0/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/sparkhistoryui/1.4.0/rewrite.xml
b/gateway-service-definitions/src/main/resources/services/sparkhistoryui/1.4.0/rewrite.xml
index 740369c..484f267 100644
--- a/gateway-service-definitions/src/main/resources/services/sparkhistoryui/1.4.0/rewrite.xml
+++ b/gateway-service-definitions/src/main/resources/services/sparkhistoryui/1.4.0/rewrite.xml
@@ -53,7 +53,7 @@
   <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/sorttable" pattern="/static/sorttable.js">
     <rewrite template="{$frontend[url]}/sparkhistory/static/sorttable.js"/>
   </rule>
-  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/jquery" pattern="/static/{jquery=jquery*.min.js}">
+  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/jquery" pattern="/static/{jquery=jquery*}">
     <rewrite template="{$frontend[url]}/sparkhistory/static/{jquery}"/>
   </rule>
   <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/initialize" pattern="/static/initialize-tooltips.js">
@@ -62,6 +62,28 @@
   <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/table" pattern="/static/table.js">
     <rewrite template="{$frontend[url]}/sparkhistory/static/table.js"/>
   </rule>
+  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/historypage-common"
pattern="/static/historypage-common.js">
+    <rewrite template="{$frontend[url]}/sparkhistory/static/historypage-common.js"/>
+  </rule>
+  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/dataTables" pattern="/static/{dataTables=dataTables*}">
+    <rewrite template="{$frontend[url]}/sparkhistory/static/{dataTables}"/>
+  </rule>
+  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/jsonFormatter" pattern="/static/{jsonFormatter=jsonFormatter*}">
+    <rewrite template="{$frontend[url]}/sparkhistory/static/{jsonFormatter}"/>
+  </rule>
+  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/utils" pattern="/static/utils.js">
+    <rewrite template="{$frontend[url]}/sparkhistory/static/utils.js"/>
+  </rule>
+  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/historypage" pattern="/static/historypage.js">
+    <rewrite template="{$frontend[url]}/sparkhistory/static/historypage.js"/>
+  </rule>
+  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/log-view" pattern="/static/log-view.js">
+    <rewrite template="{$frontend[url]}/sparkhistory/static/log-view.js"/>
+  </rule>
+  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/webui" pattern="/static/webui.js">
+    <rewrite template="{$frontend[url]}/sparkhistory/static/webui.js"/>
+  </rule>
+
   <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/additional" pattern="/static/additional-metrics.js">
     <rewrite template="{$frontend[url]}/sparkhistory/static/additional-metrics.js"/>
   </rule>
@@ -110,4 +132,32 @@
       <apply path="X-Forwarded-Context" rule="SPARKHISTORYUI/sparkhistory/outbound/rqheaders/xfc"/>
     </content>
   </filter>
+
+  <!-- re-write rules for historypage-template page-->
+  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/uiroot">
+    <rewrite template="{$frontend[url]}/sparkhistory"/>
+  </rule>
+  <filter name="SPARKHISTORYUI/sparkhistory/outbound/historypage-template">
+    <content type="*/html">
+      <apply path="\{\{uiroot\}\}" rule="SPARKHISTORYUI/sparkhistory/outbound/uiroot"/>
+    </content>
+  </filter>
+
+  <!-- re-write rules for historypage.js-->
+  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/historypage/api">
+    <rewrite template="{$frontend[url]}/sparkhistory/api"/>
+  </rule>
+  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/historypage/static">
+    <rewrite template="{$frontend[url]}/sparkhistory/static"/>
+  </rule>
+  <filter name="SPARKHISTORYUI/sparkhistory/outbound/historypage">
+    <content type="*/x-javascript">
+      <apply path="api" rule="SPARKHISTORYUI/sparkhistory/outbound/historypage/api"/>
+      <apply path="static" rule="SPARKHISTORYUI/sparkhistory/outbound/historypage/static"/>
+    </content>
+    <content type="application/javascript">
+      <apply path="api" rule="SPARKHISTORYUI/sparkhistory/outbound/historypage/api"/>
+      <apply path="static" rule="SPARKHISTORYUI/sparkhistory/outbound/historypage/static"/>
+    </content>
+  </filter>
 </rules>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/knox/blob/bf3fc5eb/gateway-service-definitions/src/main/resources/services/sparkhistoryui/1.4.0/service.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/sparkhistoryui/1.4.0/service.xml
b/gateway-service-definitions/src/main/resources/services/sparkhistoryui/1.4.0/service.xml
index e42c2c6..f6ae415 100644
--- a/gateway-service-definitions/src/main/resources/services/sparkhistoryui/1.4.0/service.xml
+++ b/gateway-service-definitions/src/main/resources/services/sparkhistoryui/1.4.0/service.xml
@@ -24,6 +24,12 @@
             <rewrite apply="SPARKHISTORYUI/sparkhistory/outbound/rqheaders" to="request.headers"/>
         </route>
         <route path="/sparkhistory/**?**"/>
+        <route path="/sparkhistory/static/historypage.js">
+            <rewrite apply="SPARKHISTORYUI/sparkhistory/outbound/historypage" to="response.body"/>
+        </route>
+        <route path="/sparkhistory/static/historypage-template.html">
+            <rewrite apply="SPARKHISTORYUI/sparkhistory/outbound/historypage-template"
to="response.body"/>
+        </route>
         <route path="/sparkhistory/history/**?**">
             <rewrite apply="SPARKHISTORYUI/sparkhistory/outbound/headers" to="response.headers"/>
         </route>


Mime
View raw message