You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/01/13 12:58:28 UTC
syncope git commit: Upgrading Swagger UI
Repository: syncope
Updated Branches:
refs/heads/master fa9e8d915 -> 47fc16898
Upgrading Swagger UI
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/47fc1689
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/47fc1689
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/47fc1689
Branch: refs/heads/master
Commit: 47fc1689813a6666ac6c1270024e1fd299d12d73
Parents: fa9e8d9
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Jan 13 12:58:21 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Jan 13 12:58:21 2016 +0100
----------------------------------------------------------------------
ext/swagger-ui/pom.xml | 22 ++-
.../META-INF/resources/swagger/index.html | 196 ++++++++++---------
pom.xml | 7 +-
3 files changed, 126 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/47fc1689/ext/swagger-ui/pom.xml
----------------------------------------------------------------------
diff --git a/ext/swagger-ui/pom.xml b/ext/swagger-ui/pom.xml
index bc3f544..d29bc61 100644
--- a/ext/swagger-ui/pom.xml
+++ b/ext/swagger-ui/pom.xml
@@ -41,6 +41,26 @@ under the License.
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ <version>${jackson.version}</version>
</dependency>
</dependencies>
@@ -98,7 +118,7 @@ under the License.
</execution>
</executions>
</plugin>
-
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/syncope/blob/47fc1689/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
----------------------------------------------------------------------
diff --git a/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html b/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
index 82e73bf..fabe736 100644
--- a/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
+++ b/ext/swagger-ui/src/main/resources/META-INF/resources/swagger/index.html
@@ -18,101 +18,105 @@ specific language governing permissions and limitations
under the License.
-->
<html>
- <head>
- <meta charset="UTF-8">
+<head>
+ <meta charset="UTF-8">
<!-- <ApacheSyncope -->
<!--<title>Swagger UI</title>-->
<title>Swagger UI - Apache Syncope ${syncope.version}</title>
<!-- </ApacheSyncope -->
- <link rel="icon" type="image/png" href="images/favicon-32x32.png" sizes="32x32" />
- <link rel="icon" type="image/png" href="images/favicon-16x16.png" sizes="16x16" />
- <link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
- <link href='css/print.css' media='print' rel='stylesheet' type='text/css'/>
- <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
- <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
- <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
- <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
- <script src='lib/handlebars-2.0.0.js' type='text/javascript'></script>
- <script src='lib/underscore-min.js' type='text/javascript'></script>
- <script src='lib/backbone-min.js' type='text/javascript'></script>
- <script src='swagger-ui.js' type='text/javascript'></script>
- <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
- <script src='lib/marked.js' type='text/javascript'></script>
- <script src='lib/swagger-oauth.js' type='text/javascript'></script>
+ <link rel="icon" type="image/png" href="images/favicon-32x32.png" sizes="32x32" />
+ <link rel="icon" type="image/png" href="images/favicon-16x16.png" sizes="16x16" />
+ <link href='css/typography.css' media='screen' rel='stylesheet' type='text/css'/>
+ <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
+ <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
+ <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
+ <link href='css/print.css' media='print' rel='stylesheet' type='text/css'/>
+ <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
+ <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
+ <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
+ <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
+ <script src='lib/handlebars-2.0.0.js' type='text/javascript'></script>
+ <script src='lib/underscore-min.js' type='text/javascript'></script>
+ <script src='lib/backbone-min.js' type='text/javascript'></script>
+ <script src='swagger-ui.js' type='text/javascript'></script>
+ <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
+ <script src='lib/jsoneditor.min.js' type='text/javascript'></script>
+ <script src='lib/marked.js' type='text/javascript'></script>
+ <script src='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> -->
+ <!-- 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 () {
+ <script type="text/javascript">
+ $(function () {
// <ApacheSyncope>
/*var url = window.location.search.match(/url=([^&]+)/);
- if (url && url.length > 1) {
- url = decodeURIComponent(url[1]);
- } else {
- url = "http://petstore.swagger.io/v2/swagger.json";
+ if (url && url.length > 1) {
+ url = decodeURIComponent(url[1]);
+ } else {
+ url = "http://petstore.swagger.io/v2/swagger.json";
}*/
var url = window.location.href.substring(0, window.location.href.lastIndexOf('/')) + "/../rest/swagger.json";
// </ApacheSyncope>
- // Pre load translate...
- if (window.SwaggerTranslator) {
- window.SwaggerTranslator.translate();
- }
- window.swaggerUi = new SwaggerUi({
- url: url,
- dom_id: "swagger-ui-container",
- supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
- onComplete: function (swaggerApi, swaggerUi) {
- if (typeof initOAuth == "function") {
- initOAuth({
- clientId: "your-client-id",
- clientSecret: "your-client-secret",
- realm: "your-realms",
- appName: "your-app-name",
- scopeSeparator: ","
- });
- }
+ // Pre load translate...
+ if(window.SwaggerTranslator) {
+ window.SwaggerTranslator.translate();
+ }
+ window.swaggerUi = new SwaggerUi({
+ url: url,
+ dom_id: "swagger-ui-container",
+ supportedSubmitMethods: ['get', 'post', 'put', 'delete', 'patch'],
+ onComplete: function(swaggerApi, swaggerUi){
+ if(typeof initOAuth == "function") {
+ initOAuth({
+ clientId: "your-client-id",
+ clientSecret: "your-client-secret-if-required",
+ realm: "your-realms",
+ appName: "your-app-name",
+ scopeSeparator: ",",
+ additionalQueryStringParams: {}
+ });
+ }
- if (window.SwaggerTranslator) {
- window.SwaggerTranslator.translate();
- }
+ if(window.SwaggerTranslator) {
+ window.SwaggerTranslator.translate();
+ }
- $('pre code').each(function (i, e) {
- hljs.highlightBlock(e)
- });
+ $('pre code').each(function(i, e) {
+ hljs.highlightBlock(e)
+ });
- addApiKeyAuthorization();
- },
- onFailure: function (data) {
- log("Unable to Load SwaggerUI");
- },
- docExpansion: "none",
- apisSorter: "alpha",
- showRequestHeaders: false
- });
+ addApiKeyAuthorization();
+ },
+ onFailure: function(data) {
+ log("Unable to Load SwaggerUI");
+ },
+ docExpansion: "none",
+ jsonEditor: false,
+ apisSorter: "alpha",
+ defaultModelRendering: 'schema',
+ showRequestHeaders: false
+ });
function addApiKeyAuthorization() {
// <ApacheSyncope>
/*var key = encodeURIComponent($('#input_apiKey')[0].value);
if (key && key.trim() != "") {
- var apiKeyAuth = new SwaggerClient.ApiKeyAuthorization("api_key", key, "query");
- window.swaggerUi.api.clientAuthorizations.add("api_key", apiKeyAuth);
- log("added key " + key);
+ var apiKeyAuth = new SwaggerClient.ApiKeyAuthorization("api_key", key, "query");
+ window.swaggerUi.api.clientAuthorizations.add("api_key", apiKeyAuth);
+ log("added key " + key);
}*/
var username = $('#input_username').val().trim();
var password = $('#input_password').val().trim();
if (username !== "" && password !== "") {
window.swaggerUi.api.clientAuthorizations.add(
"basicAuth", new SwaggerClient.PasswordAuthorization(username, password));
- }
- // </ApacheSyncope>
}
+ // </ApacheSyncope>
+ }
// <ApacheSyncope>
//$('#input_apiKey').change(addApiKeyAuthorization);
@@ -124,40 +128,40 @@ under the License.
});
// </ApacheSyncope>
- // if you have an apiKey you would like to pre-populate on the page for demonstration purposes...
- /*
- var apiKey = "myApiKeyXXXX123456789";
- $('#input_apiKey').val(apiKey);
- */
+ // if you have an apiKey you would like to pre-populate on the page for demonstration purposes...
+ /*
+ var apiKey = "myApiKeyXXXX123456789";
+ $('#input_apiKey').val(apiKey);
+ */
- window.swaggerUi.load();
+ window.swaggerUi.load();
- function log() {
- if ('console' in window) {
- console.log.apply(console, arguments);
- }
+ function log() {
+ if ('console' in window) {
+ console.log.apply(console, arguments);
}
- });
- </script>
- </head>
+ }
+ });
+ </script>
+</head>
- <body class="swagger-section">
- <div id='header'>
- <div class="swagger-ui-wrap">
- <a id="logo" href="http://swagger.io">swagger</a>
- <form id='api_selector'>
- <!-- <ApacheSyncope -->
- <!--<div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>-->
- <!--<div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>-->
- <!--<div class='input'><a id="explore" href="#" data-sw-translate>Explore</a></div>-->
+<body class="swagger-section">
+<div id='header'>
+ <div class="swagger-ui-wrap">
+ <a id="logo" href="http://swagger.io">swagger</a>
+ <form id='api_selector'>
+ <!-- <ApacheSyncope -->
+ <!--<div class='input'><input placeholder="http://example.com/api" id="input_baseUrl" name="baseUrl" type="text"/></div>-->
+ <!--<div class='input'><input placeholder="api_key" id="input_apiKey" name="apiKey" type="text"/></div>-->
+ <!--<div class='input'><a id="explore" href="#" data-sw-translate>Explore</a></div>-->
<div class='input'><input placeholder="username" id="input_username" name="username" type="text"/></div>
<div class='input'><input placeholder="password" id="input_password" name="password" type="password"/></div>
<!-- </ApacheSyncope -->
- </form>
- </div>
- </div>
+ </form>
+ </div>
+</div>
- <div id="message-bar" class="swagger-ui-wrap" data-sw-translate> </div>
- <div id="swagger-ui-container" class="swagger-ui-wrap"></div>
- </body>
+<div id="message-bar" class="swagger-ui-wrap" data-sw-translate> </div>
+<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
+</body>
</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/47fc1689/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 47aa5f9..b829c88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,7 +331,10 @@ under the License.
<camel.version>2.16.1</camel.version>
- <jackson.version>2.7.0</jackson.version>
+ <!-- Cannot upgrade to 2.7.0 because current swagger-jaxrs relies on
+ com.fasterxml.jackson.databind.type.TypeFactory.constructType(Type, Class<?>)
+ which was removed in 2.7.0 -->
+ <jackson.version>2.6.4</jackson.version>
<spring.version>4.2.4.RELEASE</spring.version>
<spring-security.version>4.0.3.RELEASE</spring-security.version>
@@ -372,7 +375,7 @@ under the License.
<activiti-modeler.directory>${project.build.directory}/activiti-modeler</activiti-modeler.directory>
<swagger-core.version>1.5.6</swagger-core.version>
- <swagger-ui.version>2.1.3</swagger-ui.version>
+ <swagger-ui.version>2.1.4</swagger-ui.version>
<jquery.version>2.2.0</jquery.version>
<jquery-ui.version>1.11.4</jquery-ui.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>