diff --git a/README.md b/README.md
index 60901fad..48d834c0 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ The previously generated war can be deployed locally executing within the direct
`cd wise-webapp;mvn jetty:run-war`
-This will start the application on the URL: [http://localhost:8080/wise-webapp/]. Additionally, a file based database is automatically populated with a test user.
+This will start the application on the URL: [http://localhost:8080/] using file based database..
User: test@wisemapping.org
Password: test
diff --git a/mindplot/pom.xml b/mindplot/pom.xml
index d12df9c6..ae777c5b 100644
--- a/mindplot/pom.xml
+++ b/mindplot/pom.xml
@@ -50,28 +50,27 @@
def outdir = new File(project.basedir, 'src/main/javascript');
- if (project.packaging != 'pom')
- {
- def dir = new File(project.basedir, 'src/main/resources/');
+ if (project.packaging != 'pom') {
+ def dir = new File(project.basedir, 'src/main/resources/');
- dir.eachFile { file ->
- def matcher = file.name =~ /messages_(.+)\.properties/;
- def lang = matcher[0][1];
- def outfile = new File(outdir, "MessageBundle_${lang}.js");
- println "Converting ${file.name} to ${outfile.name}";
+ dir.eachFile { file ->
+ def matcher = file.name =~ /messages_(.+)\.properties/;
+ def lang = matcher[0][1];
+ def outfile = new File(outdir, "MessageBundle_${lang}.js");
+ println "Converting ${file.name} to ${outfile.name}";
- outfile.withWriter('UTF-8') { out ->
- out.writeLine "mindplot.Messages.BUNDLES['${lang.toLowerCase()}'] = { ";
- file.eachLine('UTF-8') { line ->
- if( line.trim()!="" && line[0]!='#' ) {
- matcher = line =~ /(.+)=(.+)/;
- out.writeLine("'${matcher[0][1]}' : \"${matcher[0][2]}\",");
- }
- }
- out.writeLine("'DUMMY' : '' ");
- out.writeLine "};"
- }
- }
+ outfile.withWriter('UTF-8') { out ->
+ out.writeLine "mindplot.Messages.BUNDLES['${lang.toLowerCase()}'] = { ";
+ file.eachLine('UTF-8') { line ->
+ if (line.trim() != "" && line[0] != '#') {
+ matcher = line =~ /(.+)=(.+)/;
+ out.writeLine("'${matcher[0][1]}' : \"${matcher[0][2]}\",");
+ }
+ }
+ out.writeLine("'DUMMY' : '' ");
+ out.writeLine "};"
+ }
+ }
}
@@ -258,13 +257,13 @@
com.github.searls
jasmine-maven-plugin
1.3.1.5
-
-
-
- test
-
-
-
+
+
+
+
+
+
+
net.sourceforge.htmlunit
diff --git a/pom.xml b/pom.xml
index 5c191319..ff8eda62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
org.apache.maven.plugins
maven-dependency-plugin
- 2.5
+ 2.10
org.jvnet.jaxb2.maven2
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index d0717085..4ff898ea 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -28,7 +28,8 @@
- 3.1.3.RELEASE
+ 3.2.18.RELEASE
+ 3.2.10.RELEASE
@@ -61,9 +62,8 @@
org.testng
testng
- 5.8
+ 6.9.8
test
- jdk15
com.intellij
@@ -80,13 +80,13 @@
org.springframework.security
spring-security-ldap
- ${org.springframework.version}
+ ${org.springframework.addons}
compile
org.springframework.security
spring-security-openid
- ${org.springframework.version}
+ ${org.springframework.addons}
compile
@@ -122,7 +122,7 @@
org.apache.xmlgraphics
fop
- 0.94
+ 2.3
org.springframework
@@ -163,19 +163,19 @@
org.springframework.security
spring-security-web
- ${org.springframework.version}
+ ${org.springframework.addons}
compile
org.springframework.security
spring-security-core
- ${org.springframework.version}
+ ${org.springframework.addons}
compile
org.springframework.security
spring-security-config
- ${org.springframework.version}
+ ${org.springframework.addons}
runtime
@@ -205,7 +205,7 @@
org.apache.xmlgraphics
batik-transcoder
- 1.7
+ 1.9.1
compile
@@ -217,8 +217,13 @@
org.apache.xmlgraphics
batik-codec
- 1.7
+ 1.9.1
+
+
+
+
+
javax
javaee-api
diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
index 8895dae4..e44a9c52 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
@@ -1,9 +1,9 @@
-log4j.rootLogger=WARN, stdout, R
-log4j.logger.com.wisemapping=WARN,stdout,R
-log4j.logger.org.springframework=WARN,stdout,R
-log4j.logger.org.codehaus.jackson=WARN,stdout,R
-log4j.logger.org.hibernate=WARN,stdout,R
-log4j.logger.org.hibernate.engine.StatefulPersistenceContext=ERROR,stdout,R
+log4j.rootLogger=DEBUG, stdout, R
+log4j.logger.com.wisemapping=DEBUG,stdout,R
+log4j.logger.org.springframework=DEBUG,stdout,R
+log4j.logger.org.codehaus.jackson=DEBUG,stdout,R
+log4j.logger.org.hibernate=DEBUG,stdout,R
+log4j.logger.org.hibernate.engine.StatefulPersistenceContext=DEBUG,stdout,R
#log4j.logger.org.hibernate.SQL=WARN,stdout,R
diff --git a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportSVGBasedTest.java b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportSVGBasedTest.java
index ddb366c5..55b6f5cd 100644
--- a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportSVGBasedTest.java
+++ b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportSVGBasedTest.java
@@ -92,11 +92,11 @@ public class ExportSVGBasedTest {
final File[] svgFile = dataDir.listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
- return name.endsWith(".svg") && !name.contains( "-exp.svg");
+ return name.endsWith(".svg") && !name.contains("-exp.svg");
}
});
- if(svgFile==null){
+ if (svgFile == null) {
throw new IllegalArgumentException("Wrong based path specified. Change based path...");
}
diff --git a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportXsltBasedTest.java b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportXsltBasedTest.java
index 30c209c1..f6f69d3b 100644
--- a/wise-webapp/src/test/java/com/wisemapping/test/export/ExportXsltBasedTest.java
+++ b/wise-webapp/src/test/java/com/wisemapping/test/export/ExportXsltBasedTest.java
@@ -13,6 +13,7 @@ import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import java.io.*;
+import java.nio.charset.StandardCharsets;
@Test
public class ExportXsltBasedTest {
@@ -32,7 +33,7 @@ public class ExportXsltBasedTest {
// Export mile content ...
final ByteArrayOutputStream bos = new ByteArrayOutputStream();
exporter.export(wiseMapContent, bos);
- final String exportContent = new String(bos.toByteArray(), ENC_UTF_8);
+ final String exportContent = new String(bos.toByteArray(), StandardCharsets.UTF_8);
Assert.assertEquals(exportContent, recContent);
} else {
diff --git a/wise-webapp/src/test/resources/data/export/bigmap.doc b/wise-webapp/src/test/resources/data/export/bigmap.doc
index debdbe7d..daa5ee47 100644
--- a/wise-webapp/src/test/resources/data/export/bigmap.doc
+++ b/wise-webapp/src/test/resources/data/export/bigmap.doc
@@ -1,5 +1,5 @@
-
+
corona
diff --git a/wise-webapp/src/test/resources/data/export/bigmap.odt b/wise-webapp/src/test/resources/data/export/bigmap.odt
index 31ff1723..4a1baee6 100644
--- a/wise-webapp/src/test/resources/data/export/bigmap.odt
+++ b/wise-webapp/src/test/resources/data/export/bigmap.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/bug2.doc b/wise-webapp/src/test/resources/data/export/bug2.doc
index c6ec5345..147d968e 100644
--- a/wise-webapp/src/test/resources/data/export/bug2.doc
+++ b/wise-webapp/src/test/resources/data/export/bug2.doc
@@ -1,5 +1,5 @@
-
+
SaberMás
diff --git a/wise-webapp/src/test/resources/data/export/bug2.odt b/wise-webapp/src/test/resources/data/export/bug2.odt
index 7b67b000..fd67cef8 100644
--- a/wise-webapp/src/test/resources/data/export/bug2.odt
+++ b/wise-webapp/src/test/resources/data/export/bug2.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/bug3.doc b/wise-webapp/src/test/resources/data/export/bug3.doc
index 85002d6c..1820b1b1 100644
--- a/wise-webapp/src/test/resources/data/export/bug3.doc
+++ b/wise-webapp/src/test/resources/data/export/bug3.doc
@@ -1,5 +1,5 @@
-
+
Indicator needs
diff --git a/wise-webapp/src/test/resources/data/export/bug3.odt b/wise-webapp/src/test/resources/data/export/bug3.odt
index 29c594b0..4ad9a778 100644
--- a/wise-webapp/src/test/resources/data/export/bug3.odt
+++ b/wise-webapp/src/test/resources/data/export/bug3.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/cdata-support.doc b/wise-webapp/src/test/resources/data/export/cdata-support.doc
index 8b0214ed..c8243d2f 100644
--- a/wise-webapp/src/test/resources/data/export/cdata-support.doc
+++ b/wise-webapp/src/test/resources/data/export/cdata-support.doc
@@ -1,5 +1,5 @@
-
+
Observation
diff --git a/wise-webapp/src/test/resources/data/export/cdata-support.odt b/wise-webapp/src/test/resources/data/export/cdata-support.odt
index e65ecaaa..9d5f03b2 100644
--- a/wise-webapp/src/test/resources/data/export/cdata-support.odt
+++ b/wise-webapp/src/test/resources/data/export/cdata-support.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/complex.doc b/wise-webapp/src/test/resources/data/export/complex.doc
index abf358a4..c95e10c7 100644
--- a/wise-webapp/src/test/resources/data/export/complex.doc
+++ b/wise-webapp/src/test/resources/data/export/complex.doc
@@ -1,5 +1,5 @@
-
+
PPM Plan
diff --git a/wise-webapp/src/test/resources/data/export/complex.odt b/wise-webapp/src/test/resources/data/export/complex.odt
index d62aed5b..37ec42dc 100644
--- a/wise-webapp/src/test/resources/data/export/complex.odt
+++ b/wise-webapp/src/test/resources/data/export/complex.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/emptyNodes.doc b/wise-webapp/src/test/resources/data/export/emptyNodes.doc
index d221f1e8..a16a19e7 100644
--- a/wise-webapp/src/test/resources/data/export/emptyNodes.doc
+++ b/wise-webapp/src/test/resources/data/export/emptyNodes.doc
@@ -1,5 +1,5 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/emptyNodes.odt b/wise-webapp/src/test/resources/data/export/emptyNodes.odt
index 0e2130b4..b0f24a78 100644
--- a/wise-webapp/src/test/resources/data/export/emptyNodes.odt
+++ b/wise-webapp/src/test/resources/data/export/emptyNodes.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/enc.doc b/wise-webapp/src/test/resources/data/export/enc.doc
index 19651805..3d54144e 100644
--- a/wise-webapp/src/test/resources/data/export/enc.doc
+++ b/wise-webapp/src/test/resources/data/export/enc.doc
@@ -1,5 +1,5 @@
-
+
Artigos GF comentários interessantes
diff --git a/wise-webapp/src/test/resources/data/export/enc.odt b/wise-webapp/src/test/resources/data/export/enc.odt
index a7100900..a4385daa 100644
--- a/wise-webapp/src/test/resources/data/export/enc.odt
+++ b/wise-webapp/src/test/resources/data/export/enc.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/huge.doc b/wise-webapp/src/test/resources/data/export/huge.doc
index 90abe479..070b5c69 100644
--- a/wise-webapp/src/test/resources/data/export/huge.doc
+++ b/wise-webapp/src/test/resources/data/export/huge.doc
@@ -1,5 +1,5 @@
-
+
I Care
diff --git a/wise-webapp/src/test/resources/data/export/huge.odt b/wise-webapp/src/test/resources/data/export/huge.odt
index 0aa3d597..a53dde74 100644
--- a/wise-webapp/src/test/resources/data/export/huge.odt
+++ b/wise-webapp/src/test/resources/data/export/huge.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/i18n.doc b/wise-webapp/src/test/resources/data/export/i18n.doc
index 5f83488d..404ebad5 100644
--- a/wise-webapp/src/test/resources/data/export/i18n.doc
+++ b/wise-webapp/src/test/resources/data/export/i18n.doc
@@ -1,5 +1,5 @@
-
+
i18n
diff --git a/wise-webapp/src/test/resources/data/export/i18n.odt b/wise-webapp/src/test/resources/data/export/i18n.odt
index a2b546f0..f44e2a1c 100644
--- a/wise-webapp/src/test/resources/data/export/i18n.odt
+++ b/wise-webapp/src/test/resources/data/export/i18n.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/i18n2.doc b/wise-webapp/src/test/resources/data/export/i18n2.doc
index 535cf40b..8ee52ce3 100644
--- a/wise-webapp/src/test/resources/data/export/i18n2.doc
+++ b/wise-webapp/src/test/resources/data/export/i18n2.doc
@@ -1,5 +1,5 @@
-
+
أَبْجَدِيَّة عَرَبِيَّة
diff --git a/wise-webapp/src/test/resources/data/export/i18n2.odt b/wise-webapp/src/test/resources/data/export/i18n2.odt
index 310878c4..e96249d3 100644
--- a/wise-webapp/src/test/resources/data/export/i18n2.odt
+++ b/wise-webapp/src/test/resources/data/export/i18n2.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/issue.doc b/wise-webapp/src/test/resources/data/export/issue.doc
index f5facc32..5dcb7e80 100644
--- a/wise-webapp/src/test/resources/data/export/issue.doc
+++ b/wise-webapp/src/test/resources/data/export/issue.doc
@@ -1,5 +1,5 @@
-
+
La computadora
diff --git a/wise-webapp/src/test/resources/data/export/issue.odt b/wise-webapp/src/test/resources/data/export/issue.odt
index 3d60e4ff..5b2b219a 100644
--- a/wise-webapp/src/test/resources/data/export/issue.odt
+++ b/wise-webapp/src/test/resources/data/export/issue.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/longnodes.doc b/wise-webapp/src/test/resources/data/export/longnodes.doc
index f941de58..2f07d341 100644
--- a/wise-webapp/src/test/resources/data/export/longnodes.doc
+++ b/wise-webapp/src/test/resources/data/export/longnodes.doc
@@ -1,5 +1,5 @@
-
+
I have HTML In Nodes
diff --git a/wise-webapp/src/test/resources/data/export/longnodes.odt b/wise-webapp/src/test/resources/data/export/longnodes.odt
index 142de546..39b1f25c 100644
--- a/wise-webapp/src/test/resources/data/export/longnodes.odt
+++ b/wise-webapp/src/test/resources/data/export/longnodes.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/npe.doc b/wise-webapp/src/test/resources/data/export/npe.doc
index db2317d1..680f69cd 100644
--- a/wise-webapp/src/test/resources/data/export/npe.doc
+++ b/wise-webapp/src/test/resources/data/export/npe.doc
@@ -1,5 +1,5 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/npe.odt b/wise-webapp/src/test/resources/data/export/npe.odt
index 64e1ffe9..bf4fe10d 100644
--- a/wise-webapp/src/test/resources/data/export/npe.odt
+++ b/wise-webapp/src/test/resources/data/export/npe.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/process.doc b/wise-webapp/src/test/resources/data/export/process.doc
index ff0d04a4..2a7af7b1 100644
--- a/wise-webapp/src/test/resources/data/export/process.doc
+++ b/wise-webapp/src/test/resources/data/export/process.doc
@@ -1,5 +1,5 @@
-
+
California
diff --git a/wise-webapp/src/test/resources/data/export/process.odt b/wise-webapp/src/test/resources/data/export/process.odt
index 4e678b46..98d0e14c 100644
--- a/wise-webapp/src/test/resources/data/export/process.odt
+++ b/wise-webapp/src/test/resources/data/export/process.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/sample2.doc b/wise-webapp/src/test/resources/data/export/sample2.doc
index 23f8e3c6..e0dfab7a 100644
--- a/wise-webapp/src/test/resources/data/export/sample2.doc
+++ b/wise-webapp/src/test/resources/data/export/sample2.doc
@@ -1,5 +1,5 @@
-
+
Prospace
diff --git a/wise-webapp/src/test/resources/data/export/sample2.odt b/wise-webapp/src/test/resources/data/export/sample2.odt
index 194834ab..88e617dc 100644
--- a/wise-webapp/src/test/resources/data/export/sample2.odt
+++ b/wise-webapp/src/test/resources/data/export/sample2.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/sample3.doc b/wise-webapp/src/test/resources/data/export/sample3.doc
index 8a7243be..53f81500 100644
--- a/wise-webapp/src/test/resources/data/export/sample3.doc
+++ b/wise-webapp/src/test/resources/data/export/sample3.doc
@@ -1,5 +1,5 @@
-
+
Clickview Overview
diff --git a/wise-webapp/src/test/resources/data/export/sample3.odt b/wise-webapp/src/test/resources/data/export/sample3.odt
index b471cbbc..9eff6452 100644
--- a/wise-webapp/src/test/resources/data/export/sample3.odt
+++ b/wise-webapp/src/test/resources/data/export/sample3.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/sample4.doc b/wise-webapp/src/test/resources/data/export/sample4.doc
index 8a7243be..53f81500 100644
--- a/wise-webapp/src/test/resources/data/export/sample4.doc
+++ b/wise-webapp/src/test/resources/data/export/sample4.doc
@@ -1,5 +1,5 @@
-
+
Clickview Overview
diff --git a/wise-webapp/src/test/resources/data/export/sample4.odt b/wise-webapp/src/test/resources/data/export/sample4.odt
index b471cbbc..9eff6452 100644
--- a/wise-webapp/src/test/resources/data/export/sample4.odt
+++ b/wise-webapp/src/test/resources/data/export/sample4.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/simple-maps.doc b/wise-webapp/src/test/resources/data/export/simple-maps.doc
index ff20e22a..9259dff0 100644
--- a/wise-webapp/src/test/resources/data/export/simple-maps.doc
+++ b/wise-webapp/src/test/resources/data/export/simple-maps.doc
@@ -1,5 +1,5 @@
-
+
Así que quieres recorrer Medellín...
diff --git a/wise-webapp/src/test/resources/data/export/simple-maps.odt b/wise-webapp/src/test/resources/data/export/simple-maps.odt
index bb16851b..ba73df7f 100644
--- a/wise-webapp/src/test/resources/data/export/simple-maps.odt
+++ b/wise-webapp/src/test/resources/data/export/simple-maps.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/welcome-reloaded.doc b/wise-webapp/src/test/resources/data/export/welcome-reloaded.doc
index 35eaab6b..08e7633e 100644
--- a/wise-webapp/src/test/resources/data/export/welcome-reloaded.doc
+++ b/wise-webapp/src/test/resources/data/export/welcome-reloaded.doc
@@ -1,5 +1,5 @@
-
+
Welcome To WiseMapping
diff --git a/wise-webapp/src/test/resources/data/export/welcome-reloaded.odt b/wise-webapp/src/test/resources/data/export/welcome-reloaded.odt
index 73a0f1c2..ded05c65 100644
--- a/wise-webapp/src/test/resources/data/export/welcome-reloaded.odt
+++ b/wise-webapp/src/test/resources/data/export/welcome-reloaded.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/export/welcome.doc b/wise-webapp/src/test/resources/data/export/welcome.doc
index 09881a30..5d3c917a 100644
--- a/wise-webapp/src/test/resources/data/export/welcome.doc
+++ b/wise-webapp/src/test/resources/data/export/welcome.doc
@@ -1,5 +1,5 @@
-
+
Welcome To WiseMapping
diff --git a/wise-webapp/src/test/resources/data/export/welcome.odt b/wise-webapp/src/test/resources/data/export/welcome.odt
index d376e0ad..c2d4b9e8 100644
--- a/wise-webapp/src/test/resources/data/export/welcome.odt
+++ b/wise-webapp/src/test/resources/data/export/welcome.odt
@@ -1,4 +1,4 @@
-
+
diff --git a/wise-webapp/src/test/resources/data/svg/bug-nbsp-exp.svg b/wise-webapp/src/test/resources/data/svg/bug-nbsp-exp.svg
index a0e50f43..648b34b5 100644
--- a/wise-webapp/src/test/resources/data/svg/bug-nbsp-exp.svg
+++ b/wise-webapp/src/test/resources/data/svg/bug-nbsp-exp.svg
@@ -1,5 +1,5 @@
-