You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by lm...@apache.org on 2017/11/16 21:33:20 UTC
[1/2] knox git commit: KNOX-1118 - Remove POC Service Definition for
AmbariUI
Repository: knox
Updated Branches:
refs/heads/master d4b0dc608 -> 24d51ad9e
KNOX-1118 - Remove POC Service Definition for AmbariUI
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/fa6acbef
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/fa6acbef
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/fa6acbef
Branch: refs/heads/master
Commit: fa6acbef83700e0fbbbe23fa1ffac8d6b103b94a
Parents: d4b0dc6
Author: Larry McCay <lm...@hortonworks.com>
Authored: Thu Nov 16 15:31:44 2017 -0500
Committer: Larry McCay <lm...@hortonworks.com>
Committed: Thu Nov 16 16:33:00 2017 -0500
----------------------------------------------------------------------
.../services/ambariui/2.2.1/rewrite.xml | 104 -------------------
.../services/ambariui/2.2.1/service.xml | 92 ----------------
2 files changed, 196 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/fa6acbef/gateway-service-definitions/src/main/resources/services/ambariui/2.2.1/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/ambariui/2.2.1/rewrite.xml b/gateway-service-definitions/src/main/resources/services/ambariui/2.2.1/rewrite.xml
deleted file mode 100644
index 0c99d76..0000000
--- a/gateway-service-definitions/src/main/resources/services/ambariui/2.2.1/rewrite.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<rules>
- <rule dir="IN" name="AMBARIUI/ambari/inbound/root" pattern="*://*:*/**/ambari/">
- <rewrite template="{$serviceUrl[AMBARIUI]}/"/>
- </rule>
- <rule dir="IN" name="AMBARIUI/ambari/inbound/path" pattern="*://*:*/**/ambari/{**}">
- <rewrite template="{$serviceUrl[AMBARIUI]}/{**}"/>
- </rule>
- <rule dir="IN" name="AMBARIUI/ambari/inbound/query" pattern="*://*:*/**/ambari/{**}?{**}">
- <rewrite template="{$serviceUrl[AMBARIUI]}/{**}?{**}"/>
- </rule>
-
- <rule dir="OUT" name="AMBARIUI/ambari/outbound/sitepath">
- <rewrite template="{$frontend[path]}/"/>
- </rule>
-
- <rule dir="OUT" name="AMBARIUI/ambari/outbound/extrapath">
- <rewrite template="{$frontend[path]}/api/v1"/>
- </rule>
- <rule dir="OUT" name="AMBARIUI/ambari/outbound/logohref">
- <rewrite template="#/main/dashboard"/>
- </rule>
- <rule dir="OUT" name="AMBARIUI/ambari/outbound/img" pattern="/img/{**}">
- <rewrite template="{$frontend[url]}/img/{**}"/>
- </rule>
-
- <rule dir="OUT" name="AMBARIUI/ambari/outbound/css">
- <rewrite template="{$frontend[path]}/stylesheets/{**}"/>
- </rule>
- <rule dir="OUT" name="AMBARIUI/ambari/outbound/js">
- <rewrite template="{$frontend[path]}/javascripts/{**}"/>
- </rule>
-
- <filter name="AMBARIUI/ambari/outbound/proxyroot">
- <content type="*/x-javascript">
- <apply path="\{proxy_root\}" rule="AMBARIUI/ambari/outbound/sitepath"/>
- </content>
- <content type="application/javascript">
- <apply path="\{proxy_root\}" rule="AMBARIUI/ambari/outbound/sitepath"/>
- </content>
- </filter>
-
- <!-- filter to rewrite api prefix defined in .js from root -->
- <!-- e.g. /api/v1 -->
- <filter name="AMBARIUI/ambari/outbound/apiendpoint">
- <content type="*/x-javascript">
- <apply path="/api/v1" rule="AMBARIUI/ambari/outbound/extrapath"/>
- </content>
- <content type="application/javascript">
- <apply path="/api/v1" rule="AMBARIUI/ambari/outbound/extrapath"/>
- </content>
- </filter>
-
- <filter name="AMBARIUI/ambari/outbound/apiendpoint/html">
- <content type="text/html">
- <apply path="/api/v1" rule="AMBARIUI/ambari/outbound/extrapath"/>
- </content>
- </filter>
-
- <filter name="AMBARIUI/ambari/outbound/apiendpoint/noroot">
- <content type="*/x-javascript">
- <apply path="api/v1" rule="AMBARIUI/ambari/outbound/extrapath"/>
- </content>
- <content type="application/javascript">
- <apply path="api/v1" rule="AMBARIUI/ambari/outbound/extrapath"/>
- </content>
- </filter>
-
- <filter name="AMBARIUI/ambari/outbound/links">
- <content type="*/x-javascript">
- <apply path="/api/v1" rule="AMBARIUI/ambari/outbound/extrapath"/>
- <apply path="\{proxy_root\}" rule="AMBARIUI/ambari/outbound/sitepath"/>
- <apply path="/#/main/dashboard" rule="AMBARIUI/ambari/outbound/logohref"/>
- </content>
- <content type="application/javascript">
- <apply path="/api/v1" rule="AMBARIUI/ambari/outbound/extrapath"/>
- <apply path="\{proxy_root\}" rule="AMBARIUI/ambari/outbound/sitepath"/>
- <apply path="/#/main/dashboard" rule="AMBARIUI/ambari/outbound/logohref"/>
- </content>
- <content type="*/html">
- </content>
- </filter>
- <filter name="AMBARIUI/ambari/outbound/mainpage">
- <content type="*/html">
- <apply path="stylesheets/{**}.css" rule="AMBARIUI/ambari/outbound/css" />
- <apply path="javascripts/{**}.js" rule="AMBARIUI/ambari/outbound/js" />
- </content>
- </filter>
-</rules>
http://git-wip-us.apache.org/repos/asf/knox/blob/fa6acbef/gateway-service-definitions/src/main/resources/services/ambariui/2.2.1/service.xml
----------------------------------------------------------------------
diff --git a/gateway-service-definitions/src/main/resources/services/ambariui/2.2.1/service.xml b/gateway-service-definitions/src/main/resources/services/ambariui/2.2.1/service.xml
deleted file mode 100644
index ab4ab2b..0000000
--- a/gateway-service-definitions/src/main/resources/services/ambariui/2.2.1/service.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<service role="AMBARIUI" name="ambariui" version="2.2.0">
- <policies>
- <policy role="webappsec"/>
- <policy role="authentication" name="Anonymous"/>
- <policy role="rewrite"/>
- <policy role="authorization"/>
- </policies>
- <routes>
- <route path="/ambari">
- <rewrite apply="AMBARIUI/ambari/inbound/root" to="request.url"/>
- <rewrite apply="AMBARIUI/ambari/outbound/mainpage" to="response.body"/>
- </route>
- <route path="/ambari/**">
- <rewrite apply="AMBARIUI/ambari/inbound/path" to="request.url"/>
- </route>
- <route path="/ambari/**?**">
- <rewrite apply="AMBARIUI/ambari/inbound/query" to="request.url"/>
- </route>
- <route path="/ambari/**/app.js">
- <rewrite apply="AMBARIUI/ambari/outbound/links" to="response.body"/>
- </route>
-
- <!-- Admin View route -->
- <route path="/ambari/views/ADMIN_VIEW/**/INSTANCE/**/main.js">
- <rewrite apply="AMBARIUI/ambari/outbound/proxyroot" to="response.body"/>
- </route>
-
- <!-- Files view -->
- <route path="/ambari/views/FILES/**/assets/files-view.js">
- <rewrite apply="AMBARIUI/ambari/outbound/apiendpoint/noroot" to="response.body"/>
- </route>
-
- <!-- Capacity Scheduler view -->
- <route path="/ambari/views/CAPACITY-SCHEDULER/**/javascripts/app.js">
- <rewrite apply="AMBARIUI/ambari/outbound/apiendpoint/noroot" to="response.body"/>
- </route>
-
- <!-- Pig view -->
- <route path="/ambari/views/PIG/**/javascripts/app.js">
- <rewrite apply="AMBARIUI/ambari/outbound/apiendpoint/noroot" to="response.body"/>
- </route>
-
- <!-- Hive view route -->
- <route path="/ambari/views/HIVE/**/assets/hive.js">
- <rewrite apply="AMBARIUI/ambari/outbound/apiendpoint" to="response.body"/>
- </route>
-
- <!-- Storm View -->
- <route path="/ambari/views/Storm_Monitoring/**/scripts/models/*.js">
- <rewrite apply="AMBARIUI/ambari/outbound/apiendpoint" to="response.body"/>
- </route>
-
- <route path="/ambari/views/ZEPPELIN/*/*/">
- <rewrite apply="AMBARIUI/ambari/outbound/apiendpoint/html" to="response.body"/>
- </route>
-
- <!-- Tez View -->
- <route path="/ambari/views/TEZ/*/*/ambari-scripts/init-view.js">
- <rewrite apply="AMBARIUI/ambari/outbound/apiendpoint" to="response.body"/>
- </route>
-
- <!-- Hive 2.0 view -->
- <route path="/ambari/views/HIVE/**/assets/ui.js">
- <rewrite apply="AMBARIUI/ambari/outbound/apiendpoint/noroot" to="response.body"/>
- </route>
-
- <!-- SmartSense view -->
- <route path="/ambari/views/SMARTSENSE/**/assets/hstapp-*.js">
- <rewrite apply="AMBARIUI/ambari/outbound/apiendpoint" to="response.body"/>
- </route>
-
- <!-- No need to rewrite Slider View -->
- </routes>
- <dispatch classname="org.apache.hadoop.gateway.dispatch.PassAllHeadersNoEncodingDispatch"/>
-</service>
-
[2/2] knox git commit: KNOX-1118 - Remove POC Service Definition for
AmbariUI
Posted by lm...@apache.org.
KNOX-1118 - Remove POC Service Definition for AmbariUI
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/24d51ad9
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/24d51ad9
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/24d51ad9
Branch: refs/heads/master
Commit: 24d51ad9e36de2ad84d45d8ed19af41441b16765
Parents: fa6acbe
Author: Larry McCay <lm...@hortonworks.com>
Authored: Thu Nov 16 15:34:34 2017 -0500
Committer: Larry McCay <lm...@hortonworks.com>
Committed: Thu Nov 16 16:33:14 2017 -0500
----------------------------------------------------------------------
CHANGES | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/24d51ad9/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 2d266d6..3c84f3d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -82,6 +82,7 @@ Release Notes - Apache Knox - Version 0.14.0
* [KNOX-1068] - Add support for HTTP Head request
* [KNOX-1079] - Regression: proxy for Atlas fails with j_spring_security_check during login (Madhan Neethiraj via lmccay)
* [KNOX-1022] - Configuring knox token ttl to higher value generates an access token which is not valid
+ * [KNOX-1118] - Remove POC Service Definition for AmbariUI
------------------------------------------------------------------------------
Release Notes - Apache Knox - Version 0.13.0