vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-23 22:47:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Swagger console base URL location issue.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2014-12-16 00:43:40 -03:00
parent 81e9fa2793
commit 8003ef73bf
4 changed files with 188 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distribution/package-bin.sh
View File

@ -8,7 +8,7 @@ BASE_DIR=`pwd`
TARGET_DIR=$BASE_DIR/target TARGET_DIR=$BASE_DIR/target
JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION
WISE_WEBAPP_DIR=$JETTY_DIR/webapps/wisemapping WISE_WEBAPP_DIR=$JETTY_DIR/webapps/wisemapping
JETTY_VERSION=8.1.14.v20131031 JETTY_VERSION=8.1.16.v20140903
JETTY_DIST_DIR=jetty-distribution-${JETTY_VERSION} JETTY_DIST_DIR=jetty-distribution-${JETTY_VERSION}
JETTY_ZIP=${JETTY_DIST_DIR}.zip JETTY_ZIP=${JETTY_DIST_DIR}.zip

2
wise-webapp/src/main/webapp/WEB-INF/app.properties
View File

@ -143,7 +143,7 @@ security.openid.enabled=false
# REST Documentation # REST Documentation
# #
# This properties are used for REST API Documentation( http://localhost:8080/doc/rest/index.html) # This properties are used for REST API Documentation( http://localhost:8080/wisemapping/doc/rest/index.html)
# Change the URL for proper documentation console setup. # Change the URL for proper documentation console setup.
documentation.services.basePath=http://localhost:8080/wisemapping/service documentation.services.basePath=http://localhost:8080/wisemapping/service
documentation.services.version=3.0.1 documentation.services.version=3.0.1

2
wise-webapp/src/main/webapp/doc/rest/index.html
View File

@ -24,7 +24,7 @@
supportedSubmitMethods: ['get', 'post', 'put', 'delete'], supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
onComplete: function(swaggerApi, swaggerUi){ onComplete: function(swaggerApi, swaggerUi){
if(console) { if(console) {
console.log("Loaded SwaggerUI") console.log("Loaded SwaggerUI")
} }
$('pre code').each(function(i, e) {hljs.highlightBlock(e)}); $('pre code').each(function(i, e) {hljs.highlightBlock(e)});
}, },

4
wise-webapp/src/main/webapp/doc/rest/swagger-ui.js
View File

@ -1281,10 +1281,8 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
}; };
SwaggerUi.prototype.buildUrl = function(base, url) { SwaggerUi.prototype.buildUrl = function(base, url) {
var parts;
console.log("base is " + base); console.log("base is " + base);
parts = base.split("/"); base = base.substring(0,base.indexOf("/doc/"));
base = parts[0] + "//" + parts[2];
if (url.indexOf("/") === 0) { if (url.indexOf("/") === 0) {
return base + url; return base + url;
} else { } else {