mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-11-15 03:07:55 +01:00
Merge remote-tracking branch 'origin/develop'
Conflicts: core-js/pom.xml mindplot/pom.xml pom.xml web2d/pom.xml wise-editor/pom.xml wise-webapp/pom.xml
This commit is contained in:
commit
8db908912c
@ -9,7 +9,7 @@
|
|||||||
<groupId>org.wisemapping</groupId>
|
<groupId>org.wisemapping</groupId>
|
||||||
<artifactId>wisemapping</artifactId>
|
<artifactId>wisemapping</artifactId>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
<version>4.0.2</version>
|
<version>4.0.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<scm>
|
<scm>
|
||||||
<developerConnection>scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git</developerConnection>
|
<developerConnection>scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git</developerConnection>
|
||||||
|
47
distribution/Dockerfile
Normal file
47
distribution/Dockerfile
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
# Dockerizing WiseMapping: Dockerfile for building WiseMapping images
|
||||||
|
# Based on ubuntu:latest, installs WiseMapping (http://ww.wisemapping.org)
|
||||||
|
|
||||||
|
FROM ubuntu:latest
|
||||||
|
MAINTAINER Paulo Gustavo Veiga <pveiga@wisemapping.com>
|
||||||
|
|
||||||
|
ENV DEBIAN_FRONTEND noninteractive
|
||||||
|
ENV MYSQL_ROOT_PASSWORD password
|
||||||
|
ENV WISE_VERSION 4.0.2
|
||||||
|
|
||||||
|
# Install utilities
|
||||||
|
RUN apt-get install -y zip
|
||||||
|
|
||||||
|
# Prepare distribution
|
||||||
|
COPY target/wisemapping-v${WISE_VERSION}.zip .
|
||||||
|
RUN unzip wisemapping-v${WISE_VERSION}.zip
|
||||||
|
|
||||||
|
# Install MySQL
|
||||||
|
RUN echo mysql-server mysql-server/root_password password ${MYSQL_ROOT_PASSWORD} | debconf-set-selections;\
|
||||||
|
echo mysql-server mysql-server/root_password_again password ${MYSQL_ROOT_PASSWORD} | debconf-set-selections;\
|
||||||
|
apt-get install -y mysql-server
|
||||||
|
|
||||||
|
RUN service mysql start && \
|
||||||
|
mysql -uroot -p${MYSQL_ROOT_PASSWORD} < /wisemapping-v${WISE_VERSION}/config/database/mysql/create-database.sql && \
|
||||||
|
mysql -uwisemapping -Dwisemapping -ppassword < /wisemapping-v${WISE_VERSION}/config/database/mysql/create-schemas.sql && \
|
||||||
|
mysql -uwisemapping -Dwisemapping -ppassword < /wisemapping-v${WISE_VERSION}/config/database/mysql/apopulate-schemas.sql
|
||||||
|
|
||||||
|
# Install Java 8
|
||||||
|
RUN apt-get install -y software-properties-common && \
|
||||||
|
add-apt-repository ppa:webupd8team/java && \
|
||||||
|
apt-get update
|
||||||
|
|
||||||
|
RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections;\
|
||||||
|
echo oracle-java8-installer shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections;\
|
||||||
|
sudo apt-get install -y oracle-java8-installer
|
||||||
|
|
||||||
|
# Configure instance
|
||||||
|
COPY docker-conf/app.properties wisemapping-v4.0.1/webapps/wisemapping/WEB-INF/app.properties
|
||||||
|
|
||||||
|
# Clean up
|
||||||
|
RUN apt-get clean
|
||||||
|
RUN rm wisemapping-v${WISE_VERSION}.zip
|
||||||
|
|
||||||
|
|
||||||
|
EXPOSE 8080
|
||||||
|
|
||||||
|
CMD "sh" "-c" "service mysql start;cd wisemapping-v${WISE_VERSION};./start.sh"
|
147
distribution/docker-conf/app.properties
Normal file
147
distribution/docker-conf/app.properties
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
##################################################################################
|
||||||
|
# Database Configuration
|
||||||
|
##################################################################################
|
||||||
|
|
||||||
|
# MySQL 5.X configuration properties
|
||||||
|
database.url=jdbc:mysql://localhost/wisemapping?useUnicode=yes&characterEncoding=UTF-8
|
||||||
|
database.driver=com.mysql.jdbc.Driver
|
||||||
|
database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
|
||||||
|
database.username=wisemapping
|
||||||
|
database.password=password
|
||||||
|
database.validation.enabled=true
|
||||||
|
database.validation.query=SELECT 1
|
||||||
|
|
||||||
|
## PostgreSQL configuration properties
|
||||||
|
#database.url=jdbc:postgresql://<hostname:port>/wisemapping
|
||||||
|
#database.driver=org.postgresql.Driver
|
||||||
|
#database.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
|
||||||
|
#database.username=<username>
|
||||||
|
#database.password=<password>
|
||||||
|
#database.validation.enabled=true
|
||||||
|
#database.validation.query=
|
||||||
|
#database.validation.enabled=false
|
||||||
|
|
||||||
|
##################################################################################
|
||||||
|
# Mail configuration. Must be configured to enable user registration confirmation.
|
||||||
|
##################################################################################
|
||||||
|
|
||||||
|
#------------------------
|
||||||
|
# Plain SMTP Server Configuration
|
||||||
|
#------------------------
|
||||||
|
mail.smtp.port=25
|
||||||
|
mail.smtp.host=localhost
|
||||||
|
mail.username=root
|
||||||
|
mail.password=
|
||||||
|
mail.smtp.auth=false
|
||||||
|
mail.smtp.starttls.enable=false
|
||||||
|
mail.smtp.quitwait=false
|
||||||
|
|
||||||
|
#------------------------
|
||||||
|
# GMAIL SMTP Configuration
|
||||||
|
#------------------------
|
||||||
|
#mail.smtp.port=587
|
||||||
|
#mail.smtp.host=smtp.gmail.com
|
||||||
|
#mail.username=<gmail-user-account>
|
||||||
|
#mail.password=<gmail-password>
|
||||||
|
#mail.smtp.auth=true
|
||||||
|
#mail.smtp.starttls.enable=true
|
||||||
|
#mail.smtp.quitwait=false
|
||||||
|
|
||||||
|
#------------------------
|
||||||
|
# Emails configuration
|
||||||
|
#------------------------
|
||||||
|
|
||||||
|
# Required: "from" email account that will appear in the emails sent from the sender.
|
||||||
|
mail.serverSendEmail=root@localhost
|
||||||
|
|
||||||
|
# Optional: Support account that the users could use to contact you. This address will appear in emails and in some places in the site.
|
||||||
|
mail.supportEmail=root@localhost
|
||||||
|
|
||||||
|
# Optional: Unexpected errors will be reported to this address.
|
||||||
|
mail.errorReporterEmail=
|
||||||
|
|
||||||
|
##################################################################################
|
||||||
|
# Users Registration Configuration
|
||||||
|
##################################################################################
|
||||||
|
|
||||||
|
# Enable captcha confirmation
|
||||||
|
google.recaptcha.enabled = true
|
||||||
|
|
||||||
|
# ReCaptcha is the default captcha. Public and private keys are required.
|
||||||
|
# More Info: http://www.google.com/recaptcha .
|
||||||
|
google.recaptcha.privateKey = 6LeQ4tISAAAAAMfHMPRKyHupTfA-KE4QeTCnLXhK
|
||||||
|
google.recaptcha.publicKey = 6LeQ4tISAAAAALzCGKNgRv8UqsDx7Cb0vq4wbJBr
|
||||||
|
|
||||||
|
##################################################################################
|
||||||
|
# Site configuration
|
||||||
|
##################################################################################
|
||||||
|
|
||||||
|
# Site administration user. This user will have special permissions for operations such as removing users, set password
|
||||||
|
# etc.
|
||||||
|
admin.user = admin@wisemapping.org
|
||||||
|
|
||||||
|
# Base URL where WiseMapping is deployed. By default, It will be automatically inferred.
|
||||||
|
# If you are planning to put wisemapping behind an Apache using an Apache Proxy setup, you must enable this property.
|
||||||
|
#site.baseurl = http://example.com:8080/wisemapping
|
||||||
|
|
||||||
|
|
||||||
|
# Site Homepage URL. This will be used as URL for homepage location.
|
||||||
|
site.homepage = c/home
|
||||||
|
|
||||||
|
##################################################################################
|
||||||
|
# Google Analytics Settings
|
||||||
|
##################################################################################
|
||||||
|
google.analytics.enabled=false
|
||||||
|
google.analytics.account=UA-XXXX
|
||||||
|
|
||||||
|
##################################################################################
|
||||||
|
# Google Ads enable
|
||||||
|
##################################################################################
|
||||||
|
google.ads.enabled=false
|
||||||
|
|
||||||
|
#######################################################################################
|
||||||
|
# Authentication Configuration Section
|
||||||
|
#######################################################################################
|
||||||
|
|
||||||
|
# Two type of security are supported:
|
||||||
|
# - db: User are stored in the database. Registration is required in advance.
|
||||||
|
# - ldap: Authentication takes place using a LDAP. In this case, security.ldap.* must be configured.
|
||||||
|
security.type=db
|
||||||
|
|
||||||
|
# LDAP Configuration properties.
|
||||||
|
security.ldap.server=ldap://localhost:389
|
||||||
|
|
||||||
|
# If anonymous password is required, change the wisemapping-security-ldap.xml removing the
|
||||||
|
security.ldap.server.user=cn=pveiga,dc=wisemapping,dc=com
|
||||||
|
security.ldap.server.password=password
|
||||||
|
|
||||||
|
security.ldap.basedn=dc=wisemapping,dc=com
|
||||||
|
|
||||||
|
|
||||||
|
# This will be concatenated as part of the DN. In this case, I will be "ou=people".
|
||||||
|
# In case this need to be changed, modify the wisemapping-security-ldap.xml.
|
||||||
|
security.ldap.subDn=ou=people
|
||||||
|
|
||||||
|
# Attribute used as authentication login (Eg: in this case, the user email will be used)
|
||||||
|
security.ldap.auth.attribute=mail
|
||||||
|
|
||||||
|
security.ldap.lastName.attribute=sn
|
||||||
|
security.ldap.firstName.attribute=givenName
|
||||||
|
|
||||||
|
# Enable OpenId Authentication.
|
||||||
|
security.openid.enabled=false
|
||||||
|
|
||||||
|
# REST Documentation
|
||||||
|
#
|
||||||
|
# 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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
|||||||
<groupId>org.wisemapping</groupId>
|
<groupId>org.wisemapping</groupId>
|
||||||
<artifactId>wisemapping</artifactId>
|
<artifactId>wisemapping</artifactId>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
<version>4.0.2</version>
|
<version>4.0.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -82,32 +82,14 @@ mindplot.Designer = new Class(/** @lends Designer */{
|
|||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
_registerWheelEvents: function () {
|
_registerWheelEvents: function () {
|
||||||
var workspace = this._workspace;
|
var zoomFactor = 1.006;
|
||||||
var me = this;
|
var me = this;
|
||||||
// Zoom In and Zoom Out must active event
|
// Zoom In and Zoom Out must active event
|
||||||
$(document).on('mousewheel', function (event) {
|
$(document).on('mousewheel', function (event) {
|
||||||
// Change mousewheel handling so we let the default
|
|
||||||
// event happen if we are outside the container. -> FIXME: it still happening?
|
|
||||||
/*var coords = screenManager.getContainer().getCoordinates();
|
|
||||||
var isOutsideContainer = event.client.y < coords.top ||
|
|
||||||
event.client.y > coords.bottom ||
|
|
||||||
event.client.x < coords.left ||
|
|
||||||
event.client.x > coords.right;
|
|
||||||
|
|
||||||
if (!isOutsideContainer) {
|
|
||||||
if (event.wheel > 0) {
|
|
||||||
this.zoomIn(1.05);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
this.zoomOut(1.05);
|
|
||||||
}
|
|
||||||
event.preventDefault();
|
|
||||||
}*/
|
|
||||||
if (event.deltaY > 0) {
|
if (event.deltaY > 0) {
|
||||||
me.zoomIn(1.05);
|
me.zoomIn(zoomFactor);
|
||||||
}
|
} else {
|
||||||
else {
|
me.zoomOut(zoomFactor);
|
||||||
me.zoomOut(1.05);
|
|
||||||
}
|
}
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
});
|
});
|
||||||
|
File diff suppressed because one or more lines are too long
@ -63,6 +63,9 @@ mindplot.widget.LinkEditor = new Class(/** @lends LinkEditor */{
|
|||||||
'autofocus': 'autofocus',
|
'autofocus': 'autofocus',
|
||||||
'class': 'form-control'
|
'class': 'form-control'
|
||||||
});
|
});
|
||||||
|
input.on("keypress", function(event) {
|
||||||
|
event.stopPropagation();
|
||||||
|
});
|
||||||
|
|
||||||
if (model.getValue() != null){
|
if (model.getValue() != null){
|
||||||
input.val(model.getValue());
|
input.val(model.getValue());
|
||||||
|
12
pom.xml
12
pom.xml
@ -1,10 +1,10 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
|
||||||
http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<com.wisemapping.version>4.0.2</com.wisemapping.version>
|
<com.wisemapping.version>4.0.3</com.wisemapping.version>
|
||||||
<superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
|
<superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
@ -16,7 +16,7 @@
|
|||||||
<groupId>org.wisemapping</groupId>
|
<groupId>org.wisemapping</groupId>
|
||||||
<artifactId>wisemapping</artifactId>
|
<artifactId>wisemapping</artifactId>
|
||||||
<name>WiseMapping Project</name>
|
<name>WiseMapping Project</name>
|
||||||
<version>4.0.2</version>
|
<version>4.0.3</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<licenses>
|
<licenses>
|
||||||
@ -119,8 +119,8 @@
|
|||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.1</version>
|
<version>3.1</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<source>1.7</source>
|
<source>1.8</source>
|
||||||
<target>1.7</target>
|
<target>1.8</target>
|
||||||
<encoding>UTF-8</encoding>
|
<encoding>UTF-8</encoding>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<groupId>org.wisemapping</groupId>
|
<groupId>org.wisemapping</groupId>
|
||||||
<artifactId>wisemapping</artifactId>
|
<artifactId>wisemapping</artifactId>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
<version>4.0.2</version>
|
<version>4.0.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<groupId>org.wisemapping</groupId>
|
<groupId>org.wisemapping</groupId>
|
||||||
<artifactId>wisemapping</artifactId>
|
<artifactId>wisemapping</artifactId>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
<version>4.0.2</version>
|
<version>4.0.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -78,7 +78,7 @@ function buildDesigner(options) {
|
|||||||
headers: {"Content-Type": "application/json", "Accept": "application/json"},
|
headers: {"Content-Type": "application/json", "Accept": "application/json"},
|
||||||
data: JSON.stringify({
|
data: JSON.stringify({
|
||||||
jsErrorMsg: "Message: '" + errorMsg + "', line:'" + lineNo + "', url: :" + url,
|
jsErrorMsg: "Message: '" + errorMsg + "', line:'" + lineNo + "', url: :" + url,
|
||||||
jsStack: window.errorStack,
|
jsStack: window.event.error.stack || window.errorStack,
|
||||||
userAgent: navigator.userAgent,
|
userAgent: navigator.userAgent,
|
||||||
mapId: options.mapId
|
mapId: options.mapId
|
||||||
})
|
})
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
<groupId>org.wisemapping</groupId>
|
<groupId>org.wisemapping</groupId>
|
||||||
<artifactId>wisemapping</artifactId>
|
<artifactId>wisemapping</artifactId>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
<version>4.0.2</version>
|
<version>4.0.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
|
@ -48,6 +48,7 @@ public class SupportedUserAgent implements Serializable {
|
|||||||
boolean result = browser == Browser.FIREFOX && majorVersion >= 10;
|
boolean result = browser == Browser.FIREFOX && majorVersion >= 10;
|
||||||
result = result || browser == Browser.FIREFOX2 && majorVersion >= 17;
|
result = result || browser == Browser.FIREFOX2 && majorVersion >= 17;
|
||||||
result = result || browser == Browser.FIREFOX3 && majorVersion >= 29;
|
result = result || browser == Browser.FIREFOX3 && majorVersion >= 29;
|
||||||
|
result = result || browser == Browser.FIREFOX4 && majorVersion >= 40;
|
||||||
result = result || browser == Browser.IE8 || browser == Browser.IE9 || browser == Browser.IE11 ;
|
result = result || browser == Browser.IE8 || browser == Browser.IE9 || browser == Browser.IE11 ;
|
||||||
result = result || browser == Browser.IE && majorVersion >= 8;
|
result = result || browser == Browser.IE && majorVersion >= 8;
|
||||||
result = result || browser == Browser.OPERA10 && majorVersion >= 11;
|
result = result || browser == Browser.OPERA10 && majorVersion >= 11;
|
||||||
|
@ -72,7 +72,7 @@ public class AdminController extends BaseController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation("Note: Administration permissions required.")
|
@ApiOperation("Note: Administration permissions required.")
|
||||||
@RequestMapping(method = RequestMethod.GET, value = "admin/users/email/{email}", produces = {"application/json", "application/xml"})
|
@RequestMapping(method = RequestMethod.GET, value = "admin/users/email/{email:.+}", produces = {"application/json", "application/xml"})
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public RestUser getUserByEmail(@PathVariable String email) throws IOException {
|
public RestUser getUserByEmail(@PathVariable String email) throws IOException {
|
||||||
final User user = userService.getUserBy(email);
|
final User user = userService.getUserBy(email);
|
||||||
|
@ -51,6 +51,7 @@ public class RestUser {
|
|||||||
|
|
||||||
public RestUser(@NotNull User user) {
|
public RestUser(@NotNull User user) {
|
||||||
this.user = user;
|
this.user = user;
|
||||||
|
this.password = user.getPassword();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Calendar getCreationDate() {
|
public Calendar getCreationDate() {
|
||||||
|
@ -25,6 +25,9 @@
|
|||||||
color: #ffffff;
|
color: #ffffff;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
<script>
|
||||||
|
function submitDialogForm() {}
|
||||||
|
</script>
|
||||||
|
|
||||||
<div id="keyboardTable">
|
<div id="keyboardTable">
|
||||||
<table>
|
<table>
|
||||||
|
@ -58,14 +58,6 @@
|
|||||||
var persistence = mindplot.PersistenceManager.getInstance();
|
var persistence = mindplot.PersistenceManager.getInstance();
|
||||||
var mindmap = mindmap = persistence.load(mapId);
|
var mindmap = mindmap = persistence.load(mapId);
|
||||||
designer.loadMap(mindmap);
|
designer.loadMap(mindmap);
|
||||||
|
|
||||||
$('zoomIn').addEvent('click', function () {
|
|
||||||
designer.zoomIn();
|
|
||||||
});
|
|
||||||
|
|
||||||
$('zoomOut').addEvent('click', function () {
|
|
||||||
designer.zoomOut();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
@ -90,14 +90,6 @@
|
|||||||
var persistence = mindplot.PersistenceManager.getInstance();
|
var persistence = mindplot.PersistenceManager.getInstance();
|
||||||
var mindmap = mindmap = persistence.load(mapId);
|
var mindmap = mindmap = persistence.load(mapId);
|
||||||
designer.loadMap(mindmap);
|
designer.loadMap(mindmap);
|
||||||
|
|
||||||
$('zoomIn').addEvent('click', function () {
|
|
||||||
designer.zoomIn();
|
|
||||||
});
|
|
||||||
|
|
||||||
$('zoomOut').addEvent('click', function () {
|
|
||||||
designer.zoomOut();
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
|
Loading…
Reference in New Issue
Block a user