knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lmc...@apache.org
Subject knox git commit: KNOX-1354 - Revert KNOX-1160 in favor of using spark.ui.proxyBase to solve spark UI issues (Wei Han via lmccay)
Date Thu, 21 Jun 2018 05:47:58 GMT
Repository: knox
Updated Branches:
  refs/heads/master a80769278 -> 2aa46453d


KNOX-1354 - Revert KNOX-1160 in favor of using spark.ui.proxyBase to solve spark UI issues
(Wei Han via lmccay)

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

Branch: refs/heads/master
Commit: 2aa46453d49f19e25f989a421a3df6a3eb61a155
Parents: a807692
Author: Larry McCay <lmccay@HW14155.local>
Authored: Wed Jun 20 22:47:33 2018 -0700
Committer: Larry McCay <lmccay@HW14155.local>
Committed: Wed Jun 20 22:47:33 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/knox/blob/2aa46453/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 21d3b3a..24dc51b 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
@@ -56,7 +56,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*}">
+  <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/jquery" pattern="/static/{jquery=jquery*.min.js}">
     <rewrite template="{$frontend[url]}/sparkhistory/static/{jquery}"/>
   </rule>
   <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/static/initialize" pattern="/static/initialize-tooltips.js">
@@ -65,28 +65,6 @@
   <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>
@@ -136,34 +114,6 @@
     </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>
-
   <!-- re-write rule for location when SHS redirects to Knox SSO login page -->
   <rule dir="OUT" name="SPARKHISTORYUI/sparkhistory/outbound/headers/location/sso">
     <match pattern="{scheme}://{host}:{port}/{gateway}/{knoxsso}/{api}/{v}/websso?originalUrl={**}"/>
@@ -175,3 +125,4 @@
     </content>
   </filter>
 </rules>
+

http://git-wip-us.apache.org/repos/asf/knox/blob/2aa46453/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 c1972f3..2468b6c 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
@@ -26,12 +26,6 @@
             <rewrite apply="SPARKHISTORYUI/sparkhistory/outbound/headers/sso/filter" to="response.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"/>
             <rewrite apply="SPARKHISTORYUI/sparkhistory/outbound/rqheaders" to="request.headers"/>


Mime
View raw message