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

Merge remote-tracking branch 'origin/develop' into feature/remove_mootols

Browse Source 
Conflicts:
	mindplot/src/main/javascript/widget/LinkIconTooltip.js
	pom.xml
This commit is contained in:
Ezequiel Bergamaschi 2014-12-26 20:13:10 -03:00
commit e38f5dbce6
5 changed files with 205 additions and 191 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
JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION
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_ZIP=${JETTY_DIST_DIR}.zip

16
pom.xml
View File

@ -8,6 +8,10 @@
<superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
</properties>
<scm>
<developerConnection>scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git</developerConnection>
</scm>
<modelVersion>4.0.0</modelVersion>
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
@ -94,6 +98,9 @@
<groupId>com.github.searls</groupId>
<artifactId>jasmine-maven-plugin</artifactId>
<version>1.3.1.5</version>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5</version>
</plugin>
</plugins>
</pluginManagement>
@ -178,6 +185,15 @@
</reportPlugins>
</configuration>
</plugin>
<plugin>
<groupId>external.atlassian.jgitflow</groupId>
<artifactId>jgitflow-maven-plugin</artifactId>
<version>1.0-m4.3</version>
<configuration>
<masterBranchName>master</masterBranchName>
<developBranchName>develop</developBranchName>
</configuration>
</plugin>
</plugins>
</build>

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

@ -143,7 +143,7 @@ security.openid.enabled=false
# 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.
documentation.services.basePath=http://localhost:8080/wisemapping/service
documentation.services.version=3.0.1

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

@ -24,7 +24,7 @@
supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
onComplete: function(swaggerApi, swaggerUi){
if(console) {
console.log("Loaded SwaggerUI")
console.log("Loaded SwaggerUI")
}
$('pre code').each(function(i, e) {hljs.highlightBlock(e)});
},
@ -66,7 +66,7 @@
<div class="swagger-ui-wrap">
<h1>Welcome REST API Console</h1>
<p>Use this console to learn how to use WiseMapping REST APIs. </p>
<p><b>Important:</b> Don't forget to configure your server host url in /WEB-INF/app.properties. By default it's configure to http://localhost:8080/wisemapping/</p>
<p><b>Important:</b> Don't forget to configure your server host url in /WEB-INF/app.properties. By default it's configured to http://localhost:8080/wisemapping/</p>
<p></p>
</div>

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) {
var parts;
console.log("base is " + base);
parts = base.split("/");
base = parts[0] + "//" + parts[2];
base = base.substring(0,base.indexOf("/doc/"));
if (url.indexOf("/") === 0) {
return base + url;
} else {