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 2017/01/20 20:13:06 UTC
knox git commit: KNOX-859 - Added rule for app.*.js, extensions, jax,
and components (Prabhjyot Singh via Sandeep More)
Repository: knox
Updated Branches:
refs/heads/master 1ad4d0b05 -> 919588273
KNOX-859 - Added rule for app.*.js, extensions, jax, and components (Prabhjyot Singh via Sandeep More)
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/91958827
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/91958827
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/91958827
Branch: refs/heads/master
Commit: 91958827383d37cc3835fcd56c385bff489d9b48
Parents: 1ad4d0b
Author: Sandeep More <mo...@apache.org>
Authored: Fri Jan 20 15:12:02 2017 -0500
Committer: Sandeep More <mo...@apache.org>
Committed: Fri Jan 20 15:12:02 2017 -0500
----------------------------------------------------------------------
.../services/zeppelinui/0.6.0/rewrite.xml | 32 ++++++++++++++++++++
.../services/zeppelinui/0.6.0/service.xml | 16 ++++++++++
2 files changed, 48 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/91958827/gateway-service-definitions/src/main/resources/services/zeppelinui/0.6.0/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/zeppelinui/0.6.0/rewrite.xml b/gateway-service-definitions/src/main/resources/services/zeppelinui/0.6.0/rewrite.xml
index 595b4e1..77e0621 100644
--- a/gateway-service-definitions/src/main/resources/services/zeppelinui/0.6.0/rewrite.xml
+++ b/gateway-service-definitions/src/main/resources/services/zeppelinui/0.6.0/rewrite.xml
@@ -20,6 +20,10 @@
<rewrite template="{$serviceUrl[ZEPPELINUI]}/"/>
</rule>
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/rootAppScript" pattern="*://*:*/**/zeppelin/{path=app**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/{path=app**}"/>
+ </rule>
+
<rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/notebook" pattern="*://*:*/**/zeppelin/{**}/notebook/{**}">
<rewrite template="{$serviceUrl[ZEPPELINUI]}/{**}/notebook/{**}"/>
@@ -63,6 +67,18 @@
<rewrite template="{$serviceUrl[ZEPPELINUI]}/scripts/{**}"/>
</rule>
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/extensions" pattern="*://*:*/**/zeppelin/extensions/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/extensions/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/jax" pattern="*://*:*/**/zeppelin/jax/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/jax/{**}"/>
+ </rule>
+
+ <rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/components" pattern="*://*:*/**/zeppelin/components/{**}">
+ <rewrite template="{$serviceUrl[ZEPPELINUI]}/components/{**}"/>
+ </rule>
+
<rule dir="IN" name="ZEPPELINUI/zeppelin/inbound/assets" pattern="*://*:*/**/zeppelin/assets/{**}">
<rewrite template="{$serviceUrl[ZEPPELINUI]}/assets/{**}"/>
</rule>
@@ -88,4 +104,20 @@
<rewrite template="{$frontend[path]}/zeppelin/scripts/{**}"/>
</rule>
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/javascript" pattern="extensions/{**}">
+ <rewrite template="{$frontend[path]}/zeppelin/extensions/{**}"/>
+ </rule>
+
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/javascript" pattern="jax/{**}">
+ <rewrite template="{$frontend[path]}/zeppelin/jax/{**}"/>
+ </rule>
+
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/javascript" pattern="components/{**}">
+ <rewrite template="{$frontend[path]}/zeppelin/components/{**}"/>
+ </rule>
+
+ <rule dir="OUT" name="ZEPPELINUI/zeppelin/outbound/javascript" pattern="{path=app**}">
+ <rewrite template="{$frontend[path]}/zeppelin/{path=app**}"/>
+ </rule>
+
</rules>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/91958827/gateway-service-definitions/src/main/resources/services/zeppelinui/0.6.0/service.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/zeppelinui/0.6.0/service.xml b/gateway-service-definitions/src/main/resources/services/zeppelinui/0.6.0/service.xml
index 0946076..7702e25 100644
--- a/gateway-service-definitions/src/main/resources/services/zeppelinui/0.6.0/service.xml
+++ b/gateway-service-definitions/src/main/resources/services/zeppelinui/0.6.0/service.xml
@@ -27,6 +27,10 @@
<rewrite apply="ZEPPELINUI/zeppelin/inbound/root" to="request.url"/>
</route>
+ <route path="/zeppelin/app.*.js">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/rootAppScript" to="request.url"/>
+ </route>
+
<route path="/zeppelin/api/**">
<rewrite apply="ZEPPELINUI/zeppelin/inbound/api" to="request.url"/>
@@ -53,6 +57,18 @@
<rewrite apply="ZEPPELINUI/zeppelin/inbound/scripts" to="request.url"/>
</route>
+ <route path="/zeppelin/extensions/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/extensions" to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/jax/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/jax" to="request.url"/>
+ </route>
+
+ <route path="/zeppelin/components/**">
+ <rewrite apply="ZEPPELINUI/zeppelin/inbound/components" to="request.url"/>
+ </route>
+
<route path="/zeppelin/assets/**">
<rewrite apply="ZEPPELINUI/zeppelin/inbound/assets" to="request.url"/>
</route>