You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2018/04/25 13:00:54 UTC
[ambari] branch trunk updated: AMBARI-23677. ADDENDUM - Update
Swagger UI versions.
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 5014752 AMBARI-23677. ADDENDUM - Update Swagger UI versions.
5014752 is described below
commit 5014752a75661946919f89479e3d62f9031d4ebe
Author: Oliver Szabo <ol...@gmail.com>
AuthorDate: Wed Apr 25 14:03:26 2018 +0200
AMBARI-23677. ADDENDUM - Update Swagger UI versions.
---
.../src/main/resources/swagger/swagger.html | 91 ++++++++++++----------
ambari-logsearch/ambari-logsearch-server/pom.xml | 2 +-
.../src/main/resources/swagger/swagger.html | 91 ++++++++++++----------
3 files changed, 97 insertions(+), 87 deletions(-)
diff --git a/ambari-infra/ambari-infra-manager/src/main/resources/swagger/swagger.html b/ambari-infra/ambari-infra-manager/src/main/resources/swagger/swagger.html
index 52ebf61..0769ef7 100644
--- a/ambari-infra/ambari-infra-manager/src/main/resources/swagger/swagger.html
+++ b/ambari-infra/ambari-infra-manager/src/main/resources/swagger/swagger.html
@@ -1,41 +1,35 @@
<!DOCTYPE html>
-<!--
- 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.
--->
<html>
<head>
+ <meta charset="UTF-8">
<title>Infra Manager REST API</title>
- <link rel="icon" type="image/png" href="swagger-ui/2.1.0/images/favicon-32x32.png" sizes="32x32" />
- <link rel="icon" type="image/png" href="swagger-ui/2.1.0/images/favicon-16x16.png" sizes="16x16" />
- <link href='swagger-ui/2.1.0/css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='swagger-ui/2.1.0/css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='swagger-ui/2.1.0/css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='swagger-ui/2.1.0/css/reset.css' media='print' rel='stylesheet' type='text/css'/>
- <link href='swagger-ui/2.1.0/css/print.css' media='print' rel='stylesheet' type='text/css'/>
- <script src='swagger-ui/2.1.0/lib/jquery-1.8.0.min.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/jquery.slideto.min.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/jquery.wiggle.min.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/handlebars-2.0.0.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/underscore-min.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/backbone-min.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/swagger-ui.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/highlight.7.3.pack.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/marked.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/swagger-oauth.js' type='text/javascript'></script>
+ <link rel="icon" type="image/png" href="swagger-ui/2.2.2/images/favicon-32x32.png" sizes="32x32" />
+ <link rel="icon" type="image/png" href="swagger-ui/2.2.2/images/favicon-16x16.png" sizes="16x16" />
+ <link href='swagger-ui/2.2.2/css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
+ <link href='swagger-ui/2.2.2/css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
+ <link href='swagger-ui/2.2.2/css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
+ <link href='swagger-ui/2.2.2/css/reset.css' media='print' rel='stylesheet' type='text/css'/>
+ <link href='swagger-ui/2.2.2/css/print.css' media='print' rel='stylesheet' type='text/css'/>
+
+ <script src='swagger-ui/2.2.2/lib/object-assign-pollyfill.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/jquery-1.8.0.min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/jquery.slideto.min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/jquery.wiggle.min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/handlebars-4.0.5.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/lodash.min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/backbone-min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/swagger-ui.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/highlight.9.1.0.pack.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/highlight.9.1.0.pack_extended.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/jsoneditor.min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/marked.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/swagger-oauth.js' type='text/javascript'></script>
+
+ <!-- Some basic translations -->
+ <!-- <script src='lang/translator.js' type='text/javascript'></script> -->
+ <!-- <script src='lang/ru.js' type='text/javascript'></script> -->
+ <!-- <script src='lang/en.js' type='text/javascript'></script> -->
<script type="text/javascript">
$(function () {
@@ -46,6 +40,15 @@
var urlPrefix = location.protocol +'//'+ location.hostname+(location.port ? ':'+location.port: '');
url = urlPrefix + "/api/v1/swagger.yaml";
}
+
+ hljs.configure({
+ highlightSizeThreshold: 5000
+ });
+
+ // Pre load translate...
+ if(window.SwaggerTranslator) {
+ window.SwaggerTranslator.translate();
+ }
window.swaggerUi = new SwaggerUi({
url: url,
dom_id: "swagger-ui-container",
@@ -54,22 +57,24 @@
if(typeof initOAuth == "function") {
initOAuth({
clientId: "your-client-id",
+ clientSecret: "your-client-secret-if-required",
realm: "your-realms",
- appName: "your-app-name"
+ appName: "your-app-name",
+ scopeSeparator: " ",
+ additionalQueryStringParams: {}
});
}
- $('pre code').each(function(i, e) {
- hljs.highlightBlock(e)
- });
-
- addApiKeyAuthorization();
+ if(window.SwaggerTranslator) {
+ window.SwaggerTranslator.translate();
+ }
},
onFailure: function(data) {
log("Unable to Load SwaggerUI");
},
docExpansion: "none",
- apisSorter: "alpha",
+ jsonEditor: false,
+ defaultModelRendering: 'schema',
showRequestHeaders: false
});
@@ -109,7 +114,7 @@
</div>
</div>
-<div id="message-bar" class="swagger-ui-wrap"> </div>
+<div id="message-bar" class="swagger-ui-wrap" data-sw-translate> </div>
<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/ambari-logsearch/ambari-logsearch-server/pom.xml b/ambari-logsearch/ambari-logsearch-server/pom.xml
index c3bd436..4ebad84 100755
--- a/ambari-logsearch/ambari-logsearch-server/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-server/pom.xml
@@ -464,7 +464,7 @@
<dependency>
<groupId>org.webjars</groupId>
<artifactId>swagger-ui</artifactId>
- <version>2.1.0</version>
+ <version>2.2.2</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/resources/swagger/swagger.html b/ambari-logsearch/ambari-logsearch-server/src/main/resources/swagger/swagger.html
index 0f7ba4b..3b3b5fb 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/resources/swagger/swagger.html
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/resources/swagger/swagger.html
@@ -1,41 +1,35 @@
<!DOCTYPE html>
-<!--
- 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.
--->
<html>
<head>
+ <meta charset="UTF-8">
<title>Log Search REST API</title>
- <link rel="icon" type="image/png" href="swagger-ui/2.1.0/images/favicon-32x32.png" sizes="32x32" />
- <link rel="icon" type="image/png" href="swagger-ui/2.1.0/images/favicon-16x16.png" sizes="16x16" />
- <link href='swagger-ui/2.1.0/css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='swagger-ui/2.1.0/css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='swagger-ui/2.1.0/css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='swagger-ui/2.1.0/css/reset.css' media='print' rel='stylesheet' type='text/css'/>
- <link href='swagger-ui/2.1.0/css/print.css' media='print' rel='stylesheet' type='text/css'/>
- <script src='swagger-ui/2.1.0/lib/jquery-1.8.0.min.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/jquery.slideto.min.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/jquery.wiggle.min.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/handlebars-2.0.0.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/underscore-min.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/backbone-min.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/swagger-ui.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/highlight.7.3.pack.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/marked.js' type='text/javascript'></script>
- <script src='swagger-ui/2.1.0/lib/swagger-oauth.js' type='text/javascript'></script>
+ <link rel="icon" type="image/png" href="swagger-ui/2.2.2/images/favicon-32x32.png" sizes="32x32" />
+ <link rel="icon" type="image/png" href="swagger-ui/2.2.2/images/favicon-16x16.png" sizes="16x16" />
+ <link href='swagger-ui/2.2.2/css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
+ <link href='swagger-ui/2.2.2/css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
+ <link href='swagger-ui/2.2.2/css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
+ <link href='swagger-ui/2.2.2/css/reset.css' media='print' rel='stylesheet' type='text/css'/>
+ <link href='swagger-ui/2.2.2/css/print.css' media='print' rel='stylesheet' type='text/css'/>
+
+ <script src='swagger-ui/2.2.2/lib/object-assign-pollyfill.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/jquery-1.8.0.min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/jquery.slideto.min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/jquery.wiggle.min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/handlebars-4.0.5.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/lodash.min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/backbone-min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/swagger-ui.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/highlight.9.1.0.pack.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/highlight.9.1.0.pack_extended.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/jsoneditor.min.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/marked.js' type='text/javascript'></script>
+ <script src='swagger-ui/2.2.2/lib/swagger-oauth.js' type='text/javascript'></script>
+
+ <!-- Some basic translations -->
+ <!-- <script src='lang/translator.js' type='text/javascript'></script> -->
+ <!-- <script src='lang/ru.js' type='text/javascript'></script> -->
+ <!-- <script src='lang/en.js' type='text/javascript'></script> -->
<script type="text/javascript">
$(function () {
@@ -46,6 +40,15 @@
var urlPrefix = location.protocol +'//'+ location.hostname+(location.port ? ':'+location.port: '');
url = urlPrefix + "/api/v1/swagger.yaml";
}
+
+ hljs.configure({
+ highlightSizeThreshold: 5000
+ });
+
+ // Pre load translate...
+ if(window.SwaggerTranslator) {
+ window.SwaggerTranslator.translate();
+ }
window.swaggerUi = new SwaggerUi({
url: url,
dom_id: "swagger-ui-container",
@@ -54,22 +57,24 @@
if(typeof initOAuth == "function") {
initOAuth({
clientId: "your-client-id",
+ clientSecret: "your-client-secret-if-required",
realm: "your-realms",
- appName: "your-app-name"
+ appName: "your-app-name",
+ scopeSeparator: " ",
+ additionalQueryStringParams: {}
});
}
- $('pre code').each(function(i, e) {
- hljs.highlightBlock(e)
- });
-
- addApiKeyAuthorization();
+ if(window.SwaggerTranslator) {
+ window.SwaggerTranslator.translate();
+ }
},
onFailure: function(data) {
log("Unable to Load SwaggerUI");
},
docExpansion: "none",
- apisSorter: "alpha",
+ jsonEditor: false,
+ defaultModelRendering: 'schema',
showRequestHeaders: false
});
@@ -109,7 +114,7 @@
</div>
</div>
-<div id="message-bar" class="swagger-ui-wrap"> </div>
+<div id="message-bar" class="swagger-ui-wrap" data-sw-translate> </div>
<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
</body>
-</html>
+</html>
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
oleewere@apache.org.