Merge branch 'develop'

2024-11-21 21:57:56 +01:00 · 2018-09-14 23:08:50 -07:00 · 2018-09-14 23:08:50 -07:00 · c2334df403
commit c2334df403
parent 2ee977c501 4234ca7e38
95 changed files with 304 additions and 269 deletions
--- 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
--- a/distribution/docker-conf/app.properties
+++ b/distribution/docker-conf/app.properties
@ -65,12 +65,12 @@ mail.errorReporterEmail=
 ##################################################################################

 # Enable captcha confirmation
-google.recaptcha.enabled = true
+google.recaptcha2.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
+google.recaptcha2.siteKey = 6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
+google.recaptcha2.secretKey =  6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe

 ##################################################################################
 # Site configuration
--- a/mindplot/pom.xml
+++ b/mindplot/pom.xml
@ -50,28 +50,27 @@
                        <configuration>
                            <source>
                                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()!="" &amp;&amp; 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() != "" &amp;&amp; line[0] != '#') {
+                                                    matcher = line =~ /(.+)=(.+)/;
+                                                    out.writeLine("'${matcher[0][1]}' : \"${matcher[0][2]}\",");
+                                                }
+                                            }
+                                            out.writeLine("'DUMMY' : '' ");
+                                            out.writeLine "};"
+                                        }
+                                    }
                                }
                            </source>
                        </configuration>
@ -258,13 +257,13 @@
                <groupId>com.github.searls</groupId>
                <artifactId>jasmine-maven-plugin</artifactId>
                <version>1.3.1.5</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<goals>-->
+                            <!--<goal>test</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
                <dependencies>
                    <dependency>
                        <groupId>net.sourceforge.htmlunit</groupId>
--- a/phantomjsdriver.log
+++ b/phantomjsdriver.log
@ -0,0 +1,14 @@
+[INFO  - 2015-11-02T11:53:26.059Z] GhostDriver - Main - running on port 23859
+[INFO  - 2015-11-02T11:53:26.556Z] Session [53aba090-8158-11e5-b4b7-df7d699a4283] - _decorateNewWindow - page.settings: {"XSSAuditingEnabled":false,"javascriptCanCloseWindows":true,"javascriptCanOpenWindows":true,"javascriptEnabled":true,"loadImages":true,"localToRemoteUrlAccessEnabled":false,"userAgent":"Mozilla/5.0 (Macintosh; Intel Mac OS X) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.9.2 Safari/534.34","webSecurityEnabled":true}
+[INFO  - 2015-11-02T11:53:26.556Z] Session [53aba090-8158-11e5-b4b7-df7d699a4283] - page.customHeaders:  - {}
+[INFO  - 2015-11-02T11:53:26.556Z] Session [53aba090-8158-11e5-b4b7-df7d699a4283] - CONSTRUCTOR - Desired Capabilities: {"phantomjs.binary.path":"/Users/pveiga/repo/wisemapping/mindplot/target/phantomjs-maven-plugin/phantomjs-1.9.2-macosx/bin/phantomjs","javascriptEnabled":true}
+[INFO  - 2015-11-02T11:53:26.556Z] Session [53aba090-8158-11e5-b4b7-df7d699a4283] - CONSTRUCTOR - Negotiated Capabilities: {"browserName":"phantomjs","version":"1.9.2","driverName":"ghostdriver","driverVersion":"1.0.4","platform":"mac-unknown-32bit","javascriptEnabled":true,"takesScreenshot":true,"handlesAlerts":false,"databaseEnabled":false,"locationContextEnabled":false,"applicationCacheEnabled":false,"browserConnectionEnabled":false,"cssSelectorsEnabled":true,"webStorageEnabled":false,"rotatable":false,"acceptSslCerts":false,"nativeEvents":true,"proxy":{"proxyType":"direct"}}
+[INFO  - 2015-11-02T11:53:26.556Z] SessionManagerReqHand - _postNewSessionCommand - New Session Created: 53aba090-8158-11e5-b4b7-df7d699a4283
+[INFO  - 2015-11-02T11:53:30.454Z] ShutdownReqHand - _handle - About to shutdown
+[INFO  - 2015-11-02T11:56:02.272Z] GhostDriver - Main - running on port 47468
+[INFO  - 2015-11-02T11:56:02.546Z] Session [b0a5cff0-8158-11e5-b537-631f7ef82703] - _decorateNewWindow - page.settings: {"XSSAuditingEnabled":false,"javascriptCanCloseWindows":true,"javascriptCanOpenWindows":true,"javascriptEnabled":true,"loadImages":true,"localToRemoteUrlAccessEnabled":false,"userAgent":"Mozilla/5.0 (Macintosh; Intel Mac OS X) AppleWebKit/534.34 (KHTML, like Gecko) PhantomJS/1.9.2 Safari/534.34","webSecurityEnabled":true}
+[INFO  - 2015-11-02T11:56:02.546Z] Session [b0a5cff0-8158-11e5-b537-631f7ef82703] - page.customHeaders:  - {}
+[INFO  - 2015-11-02T11:56:02.546Z] Session [b0a5cff0-8158-11e5-b537-631f7ef82703] - CONSTRUCTOR - Desired Capabilities: {"phantomjs.binary.path":"/Users/pveiga/repo/wisemapping/mindplot/target/phantomjs-maven-plugin/phantomjs-1.9.2-macosx/bin/phantomjs","javascriptEnabled":true}
+[INFO  - 2015-11-02T11:56:02.546Z] Session [b0a5cff0-8158-11e5-b537-631f7ef82703] - CONSTRUCTOR - Negotiated Capabilities: {"browserName":"phantomjs","version":"1.9.2","driverName":"ghostdriver","driverVersion":"1.0.4","platform":"mac-unknown-32bit","javascriptEnabled":true,"takesScreenshot":true,"handlesAlerts":false,"databaseEnabled":false,"locationContextEnabled":false,"applicationCacheEnabled":false,"browserConnectionEnabled":false,"cssSelectorsEnabled":true,"webStorageEnabled":false,"rotatable":false,"acceptSslCerts":false,"nativeEvents":true,"proxy":{"proxyType":"direct"}}
+[INFO  - 2015-11-02T11:56:02.546Z] SessionManagerReqHand - _postNewSessionCommand - New Session Created: b0a5cff0-8158-11e5-b537-631f7ef82703
+[INFO  - 2015-11-02T11:56:04.055Z] ShutdownReqHand - _handle - About to shutdown
--- a/pom.xml
+++ b/pom.xml
@ -72,7 +72,7 @@
                <plugin>
                    <groupId>org.apache.maven.plugins</groupId>
                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.5</version>
+                    <version>2.10</version>
                </plugin>
                <plugin>
                    <groupId>org.jvnet.jaxb2.maven2</groupId>
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@ -28,7 +28,8 @@
    </repositories>

    <properties>
-        <org.springframework.version>3.1.3.RELEASE</org.springframework.version>
+        <org.springframework.version>3.2.18.RELEASE</org.springframework.version>
+        <org.springframework.addons>3.2.10.RELEASE</org.springframework.addons>
    </properties>

    <dependencies>
@ -61,9 +62,8 @@
        <dependency>
            <groupId>org.testng</groupId>
            <artifactId>testng</artifactId>
-            <version>5.8</version>
+            <version>6.9.8</version>
            <scope>test</scope>
-            <classifier>jdk15</classifier>
        </dependency>
        <dependency>
            <groupId>com.intellij</groupId>
@ -80,13 +80,13 @@
        <dependency>
            <groupId>org.springframework.security</groupId>
            <artifactId>spring-security-ldap</artifactId>
-            <version>${org.springframework.version}</version>
+            <version>${org.springframework.addons}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>org.springframework.security</groupId>
            <artifactId>spring-security-openid</artifactId>
-            <version>${org.springframework.version}</version>
+            <version>${org.springframework.addons}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
@ -110,7 +110,7 @@
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.2</version>
+            <version>1.7.25</version>
            <scope>runtime</scope>
        </dependency>
        <dependency>
@ -122,7 +122,7 @@
        <dependency>
            <groupId>org.apache.xmlgraphics</groupId>
            <artifactId>fop</artifactId>
-            <version>0.94</version>
+            <version>2.3</version>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
@ -145,8 +145,14 @@
        <dependency>
            <groupId>org.apache.tiles</groupId>
            <artifactId>tiles-jsp</artifactId>
-            <version>2.1.4</version>
+            <version>2.2.2</version>
            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>jcl-over-slf4j</artifactId>
+                </exclusion>
+            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.springframework</groupId>
@ -163,19 +169,19 @@
        <dependency>
            <groupId>org.springframework.security</groupId>
            <artifactId>spring-security-web</artifactId>
-            <version>${org.springframework.version}</version>
+            <version>${org.springframework.addons}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>org.springframework.security</groupId>
            <artifactId>spring-security-core</artifactId>
-            <version>${org.springframework.version}</version>
+            <version>${org.springframework.addons}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>org.springframework.security</groupId>
            <artifactId>spring-security-config</artifactId>
-            <version>${org.springframework.version}</version>
+            <version>${org.springframework.addons}</version>
            <scope>runtime</scope>
        </dependency>
        <dependency>
@ -205,7 +211,7 @@
        <dependency>
            <groupId>org.apache.xmlgraphics</groupId>
            <artifactId>batik-transcoder</artifactId>
-            <version>1.7</version>
+            <version>1.9.1</version>
            <scope>compile</scope>
            <exclusions>
                <exclusion>
@ -217,8 +223,13 @@
        <dependency>
            <groupId>org.apache.xmlgraphics</groupId>
            <artifactId>batik-codec</artifactId>
-            <version>1.7</version>
+            <version>1.9.1</version>
        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>xml-apis</groupId>-->
+            <!--<artifactId>xml-apis</artifactId>-->
+            <!--<version>1.4.01</version>-->
+        <!--</dependency>-->
        <dependency>
            <groupId>javax</groupId>
            <artifactId>javaee-api</artifactId>
@ -275,7 +286,7 @@
        <dependency>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-api</artifactId>
-            <version>1.7.2</version>
+            <version>1.7.25</version>
            <scope>runtime</scope>
        </dependency>
        <dependency>
@ -284,12 +295,6 @@
            <version>2.10.0</version>
            <scope>compile</scope>
        </dependency>
-        <dependency>
-            <groupId>net.tanesha.recaptcha4j</groupId>
-            <artifactId>recaptcha4j</artifactId>
-            <version>0.0.7</version>
-            <scope>compile</scope>
-        </dependency>
        <dependency>
            <!-- jsoup HTML parser library @ http://jsoup.org/ -->
            <groupId>org.jsoup</groupId>
@ -311,7 +316,16 @@
            <artifactId>jstl</artifactId>
            <version>1.2</version>
        </dependency>
-
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>fluent-hc</artifactId>
+            <version>4.5.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.5</version>
+        </dependency>
    </dependencies>
    <profiles>
        <profile>
@ -556,9 +570,9 @@
            </plugin>

            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
+                <groupId>org.eclipse.jetty</groupId>
                <artifactId>jetty-maven-plugin</artifactId>
-                <version>8.1.14.v20131031</version>
+                <version>9.4.12.v20180830</version>
                <configuration>
                    <baseAppFirst>false</baseAppFirst>
                    <stopKey>foo</stopKey>
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
@ -167,6 +167,10 @@ public class ExporterFactory {
                svgXml = svgXml.replaceFirst("<svg ", "<svg xmlns:xlink=\"http://www.w3.org/1999/xlink\" ");
            }

+            if (!svgXml.contains("xmlns=\"http://www.w3.org/2000/svg\"")) {
+                svgXml = svgXml.replaceFirst("<svg ", "<svg xmlns=\"http://www.w3.org/2000/svg\" ");
+            }
+
            // Hacks for some legacy cases ....
            svgXml = svgXml.replaceAll("NaN,", "0");
            svgXml = svgXml.replaceAll(",NaN", "0");
--- a/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
+++ b/wise-webapp/src/main/java/com/wisemapping/exporter/FreemindExporter.java
@ -63,10 +63,10 @@ public class FreemindExporter
        export(map.getUnzipXml(), outputStream);
    }

-    public void export(byte[] xml, @NotNull OutputStream outputStream) throws ExportException {
+    public void export(@NotNull byte[] xml, @NotNull OutputStream outputStream) throws ExportException {

        objectFactory = new com.wisemapping.jaxb.freemind.ObjectFactory();
-        nodesMap = new HashMap<String, Node>();
+        nodesMap = new HashMap<>();
        final com.wisemapping.jaxb.wisemap.Map mindmapMap;

        try {
@ -124,15 +124,7 @@ public class FreemindExporter
            }

            JAXBUtils.saveMap(freemindMap, outputStream);
-        } catch (JAXBException e) {
-            throw new ExportException(e);
-        } catch (UnsupportedEncodingException e) {
-            throw new ExportException(e);
-        } catch (SAXException e) {
-            throw new ExportException(e);
-        } catch (ParserConfigurationException e) {
-            throw new ExportException(e);
-        } catch (IOException e) {
+        } catch (JAXBException | SAXException | IOException | ParserConfigurationException e) {
            throw new ExportException(e);
        }
    }
--- a/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/MindmapIcons.java
@ -215,7 +215,7 @@ public class MindmapIcons {
    private static void load() {
        try {
            if (iconsByFamily == null) {
-                iconsByFamily = new TreeMap<IconFamily, List<MindmapIcon>>();
+                iconsByFamily = new TreeMap<>();

                Field[] fields = MindmapIcons.class.getDeclaredFields();
                for (Field field : fields) {
--- a/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/TransformerController.java
@ -41,7 +41,7 @@ public class TransformerController extends BaseController {

    @RequestMapping(method = RequestMethod.POST, value = "/transform", produces = {"application/pdf"}, consumes = {"image/svg+xml"})
    @ResponseBody
-    public ModelAndView transformPdf(@RequestBody @Nullable final String content) throws IOException {
+    public ModelAndView transformPdf(@RequestBody @Nullable final String content) {
        final Map<String, Object> values = new HashMap<String, Object>();
        if (content == null || content.length() == 0) {
            throw new IllegalArgumentException("Body can not be null.");
@ -53,7 +53,7 @@ public class TransformerController extends BaseController {

    @RequestMapping(method = RequestMethod.POST, value = "/transform", produces = {"image/svg+xml"}, consumes = {"image/svg+xml"})
    @ResponseBody
-    public ModelAndView transformSvg(@RequestBody @Nullable final String content) throws IOException {
+    public ModelAndView transformSvg(@RequestBody @Nullable final String content) {
        final Map<String, Object> values = new HashMap<String, Object>();
        if (content == null || content.length() == 0) {
            throw new IllegalArgumentException("Body can not be null.");
@ -65,7 +65,7 @@ public class TransformerController extends BaseController {

    @RequestMapping(method = RequestMethod.POST, value = "/transform", produces = {"image/png"}, consumes = {"image/svg+xml"})
    @ResponseBody
-    public ModelAndView transformPng(@RequestBody @Nullable final String content) throws IOException {
+    public ModelAndView transformPng(@RequestBody @Nullable final String content) {
        final Map<String, Object> values = new HashMap<String, Object>();
        if (content == null || content.length() == 0) {
            throw new IllegalArgumentException("Body can not be null.");
--- a/wise-webapp/src/main/java/com/wisemapping/service/RecaptchaService.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/RecaptchaService.java
@ -0,0 +1,92 @@
+package com.wisemapping.service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang.StringUtils;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.fluent.Form;
+import org.apache.http.client.fluent.Request;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Value;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class RecaptchaService {
+
+    final private static Logger logger = Logger.getLogger(RecaptchaService.class);
+    final private static String GOOGLE_RECAPTCHA_VERIFY_URL =
+            "https://www.google.com/recaptcha/api/siteverify";
+
+    private final static ObjectMapper objectMapper = new ObjectMapper();
+    private String recaptchaSecret;
+
+    public String verifyRecaptcha(String ip, String recaptchaResponse) {
+
+        final List<NameValuePair> build = Form.form()
+                .add("secret", recaptchaSecret)
+                .add("response", recaptchaResponse)
+                .add("remoteip", ip)
+                .build();
+
+        // Add logs ...
+        logger.debug("Response from remoteip: " + ip);
+        logger.debug("Response from recaptchaSecret: " + recaptchaSecret);
+        logger.debug("Response from recaptchaResponse: " + recaptchaResponse);
+
+        String result = StringUtils.EMPTY;
+        HashMap bodyJson;
+        try {
+            final byte[] body = Request
+                    .Post(GOOGLE_RECAPTCHA_VERIFY_URL)
+                    .bodyForm(build)
+                    .execute()
+                    .returnContent()
+                    .asBytes();
+
+            bodyJson = objectMapper
+                    .readValue(body, HashMap.class);
+
+            logger.debug("Response from recaptcha after parse: " + bodyJson);
+
+            final Boolean success = (Boolean) bodyJson.get("success");
+            if (!success) {
+                final List<String> errorCodes = (List<String>) bodyJson
+                        .get("error-codes");
+                result = RecaptchaUtil.RECAPTCHA_ERROR_CODE.get(errorCodes.get(0));
+            }
+        } catch (IOException e) {
+            logger.error(e.getMessage(), e);
+            result = e.getMessage();
+        }
+
+        logger.debug("Captcha Result:" + result);
+        return result;
+
+    }
+
+    public void setRecaptchaSecret(String recaptchaSecret) {
+        this.recaptchaSecret = recaptchaSecret;
+    }
+}
+
+class RecaptchaUtil {
+
+    static final Map<String, String>
+            RECAPTCHA_ERROR_CODE = new HashMap<>();
+
+    static {
+        RECAPTCHA_ERROR_CODE.put("missing-input-secret",
+                "The secret parameter is missing");
+        RECAPTCHA_ERROR_CODE.put("invalid-input-secret",
+                "The secret parameter is invalid or malformed");
+        RECAPTCHA_ERROR_CODE.put("missing-input-response",
+                "The response parameter is missing");
+        RECAPTCHA_ERROR_CODE.put("invalid-input-response",
+                "The response parameter is invalid or malformed");
+        RECAPTCHA_ERROR_CODE.put("bad-request",
+                "The request is invalid or malformed");
+    }
+}
--- a/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java
+++ b/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java
@ -26,6 +26,5 @@ public interface Messages {
    String MAP_TITLE_ALREADY_EXISTS = "MAP_TITLE_ALREADY_EXISTS";
    String LABEL_TITLE_ALREADY_EXISTS = "LABEL_TITLE_ALREADY_EXISTS";
    String PASSWORD_MISSMATCH = "PASSWORD_MISSMATCH";
-    String CAPTCHA_ERROR = "CAPTCHA_ERROR";
    String CAPTCHA_LOADING_ERROR = "CAPTCHA_LOADING_ERROR";
 }
--- a/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java
+++ b/wise-webapp/src/main/java/com/wisemapping/validator/UserValidator.java
@ -18,10 +18,10 @@

 package com.wisemapping.validator;

+import com.wisemapping.service.RecaptchaService;
 import com.wisemapping.service.UserService;
 import com.wisemapping.view.UserBean;
 import com.wisemapping.model.Constants;
-import net.tanesha.recaptcha.ReCaptcha;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.validation.Errors;
@ -32,7 +32,7 @@ public class UserValidator
        implements Validator {

    private UserService userService;
-    private ReCaptcha captchaService;
+    private RecaptchaService captchaService;


    public boolean supports(final Class clazz) {
@ -92,11 +92,11 @@ public class UserValidator
        this.userService = userService;
    }

-    public void setCaptchaService(@NotNull final ReCaptcha captchaService) {
+    public void setCaptchaService(@NotNull final RecaptchaService captchaService) {
        this.captchaService = captchaService;
    }

-    public ReCaptcha getCaptchaService() {
+    public RecaptchaService getCaptchaService() {
        return captchaService;
    }
 }
--- a/wise-webapp/src/main/java/com/wisemapping/webmvc/UsersController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/webmvc/UsersController.java
@ -1,36 +1,35 @@
 /*
-*    Copyright [2015] [wisemapping]
-*
-*   Licensed under WiseMapping Public License, Version 1.0 (the "License").
-*   It is basically the Apache License, Version 2.0 (the "License") plus the
-*   "powered by wisemapping" text requirement on every single page;
-*   you may not use this file except in compliance with the License.
-*   You may obtain a copy of the license at
-*
-*       http://www.wisemapping.org/license
-*
-*   Unless required by applicable law or agreed to in writing, software
-*   distributed under the License is distributed on an "AS IS" BASIS,
-*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*   See the License for the specific language governing permissions and
-*   limitations under the License.
-*/
+ *    Copyright [2015] [wisemapping]
+ *
+ *   Licensed under WiseMapping Public License, Version 1.0 (the "License").
+ *   It is basically the Apache License, Version 2.0 (the "License") plus the
+ *   "powered by wisemapping" text requirement on every single page;
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the license at
+ *
+ *       http://www.wisemapping.org/license
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ */

 package com.wisemapping.webmvc;


-import com.wisemapping.model.AuthenticationType;
-import com.wisemapping.service.InvalidAuthSchemaException;
-import com.wisemapping.validator.Messages;
 import com.wisemapping.exceptions.WiseMappingException;
+import com.wisemapping.model.AuthenticationType;
 import com.wisemapping.model.User;
 import com.wisemapping.security.Utils;
+import com.wisemapping.service.InvalidAuthSchemaException;
 import com.wisemapping.service.InvalidUserEmailException;
+import com.wisemapping.service.RecaptchaService;
 import com.wisemapping.service.UserService;
+import com.wisemapping.validator.Messages;
 import com.wisemapping.validator.UserValidator;
 import com.wisemapping.view.UserBean;
-import net.tanesha.recaptcha.ReCaptcha;
-import net.tanesha.recaptcha.ReCaptchaResponse;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@ -55,11 +54,13 @@ public class UsersController {
    private UserService userService;

    @Autowired
-    private ReCaptcha captchaService;
+    private RecaptchaService captchaService;

-    @Value("${google.recaptcha.enabled}")
+    @Value("${google.recaptcha2.enabled}")
    private boolean captchaEnabled;

+    @Value("${google.recaptcha2.siteKey}")
+    private String recaptchaSiteKey;

    @RequestMapping(value = "user/resetPassword", method = RequestMethod.GET)
    public ModelAndView showResetPasswordPage() {
@ -74,10 +75,7 @@ public class UsersController {
            userService.resetPassword(email);
            result = new ModelAndView("forgotPasswordSuccess");

-        } catch (InvalidUserEmailException e) {
-            result = new ModelAndView("forgotPasswordError");
-        }
-        catch (InvalidAuthSchemaException e) {
+        } catch (InvalidUserEmailException | InvalidAuthSchemaException e) {
            result = new ModelAndView("forgotPasswordError");
        }
        return result;
@ -89,10 +87,8 @@ public class UsersController {
            // If captcha is enabled, generate it ...
            final Properties prop = new Properties();
            prop.put("theme", "white");
-
-            final String captchaHtml = captchaService.createRecaptchaHtml(null, prop);
-            request.setAttribute("captchaHtml", captchaHtml);
-            request.setAttribute("captchaEnabled", true);
+            request.setAttribute("recaptchaSiteKey", recaptchaSiteKey);
+            request.setAttribute("recaptchaEnabled", true);
        }
        return new ModelAndView("userRegistration", "user", new UserBean());
    }
@ -115,7 +111,7 @@ public class UsersController {

            boolean confirmRegistrationByEmail = false;
            user.setAuthenticationType(AuthenticationType.DATABASE);
-            userService.createUser(user, confirmRegistrationByEmail,true);
+            userService.createUser(user, confirmRegistrationByEmail, true);

            // Forward to the success view ...
            result = new ModelAndView("userRegistrationSuccess");
@ -130,7 +126,7 @@ public class UsersController {
        return "accountSettings";
    }

-    private BindingResult validateRegistrationForm(@NotNull UserBean userBean, @NotNull HttpServletRequest request, @NotNull BindingResult bindingResult) {
+    private void validateRegistrationForm(@NotNull UserBean userBean, @NotNull HttpServletRequest request, @NotNull BindingResult bindingResult) {
        final UserValidator userValidator = new UserValidator();
        userValidator.setUserService(userService);
        userValidator.setCaptchaService(captchaService);
@ -138,21 +134,18 @@ public class UsersController {

        // If captcha is enabled, generate it ...
        if (captchaEnabled) {
-            final String challenge = request.getParameter("recaptcha_challenge_field");
-            final String uresponse = request.getParameter("recaptcha_response_field");
+            final String gReponse = request.getParameter("g-recaptcha-response");

-            if (challenge != null && uresponse != null) {
+            if (gReponse != null) {
                final String remoteAddr = request.getRemoteAddr();
-                final ReCaptchaResponse reCaptchaResponse = captchaService.checkAnswer(remoteAddr, challenge, uresponse);
-
-                if (!reCaptchaResponse.isValid()) {
-                    bindingResult.rejectValue("captcha", Messages.CAPTCHA_ERROR);
+                final String reCaptchaResponse = captchaService.verifyRecaptcha(remoteAddr, gReponse);
+                if (!reCaptchaResponse.isEmpty()) {
+                    bindingResult.rejectValue("captcha", reCaptchaResponse);
                }

            } else {
                bindingResult.rejectValue("captcha", Messages.CAPTCHA_LOADING_ERROR);
            }
        }
-        return bindingResult;
    }
 }
--- a/wise-webapp/src/main/resources/messages_ca.properties
+++ b/wise-webapp/src/main/resources/messages_ca.properties
@ -52,7 +52,6 @@ PASSWORD_MISSMATCH=La contrasenya no concorda
 WISEMAPPING_ACCOUNT_MESSAGE=Si us plau verifiqui la informació i llegeixi les condicions del servei.
 REGISTRATION_CLICK_ADVICE= Seleccionant "Registre" està acceptant les condicions del servei.
 REGISTRATION_TITLE_MSG=Completi el següent formulari per a convertir-se en memore de la comunitat WiseMapping. </br>El registre és <strong>de franc</strong> i només és un moment.
-CAPTCHA_ERROR=Entri els caràcters com a la imatge superior.
 CREATOR=Creador
 CREATION_TIME=Data de creació
 EDITORS=Editors
--- a/wise-webapp/src/main/resources/messages_de.properties
+++ b/wise-webapp/src/main/resources/messages_de.properties
@ -64,7 +64,6 @@ CHANGE_PASSWORD_SUCCESS=Ihr Passwort wurde erfolgreich geändert
 WISEMAPPING_ACCOUNT_MESSAGE=Bitte überprüfen Sie die eingegebenen WiseMapping Benutzerkonto Informationen und Geschäftsbedingungen
 REGISTRATION_CLICK_ADVICE= Mit der Registrierung erklären Sie ihr Einverständnis mit den Geschäftsbedingungen und Datenschutzregeln von WiseMapping.
 REGISTRATION_TITLE_MSG=Bitte fülle die Felder aus, um ein Mitglied der WiseMapping Gemeinschaft zu werden. Die Registrierung is <b>kostenlos</b> und in wenigen Augenblicken erledigt.
-CAPTCHA_ERROR=Bitte geben Sie die Buchstaben wie auf dem Bild dargestellt ein.
 CREATOR=Urheber
 CREATION_TIME=Erstellungs Datum
 EDITORS=Verfasser
--- a/wise-webapp/src/main/resources/messages_en.properties
+++ b/wise-webapp/src/main/resources/messages_en.properties
@ -66,7 +66,6 @@ CHANGE_PASSWORD_SUCCESS=Your password has been changed successfully.
 WISEMAPPING_ACCOUNT_MESSAGE=Please check the WiseMapping Account information you've entered above, and review the Terms of Service
 REGISTRATION_CLICK_ADVICE= By clicking on 'Register' below you are agreeing to the Terms of Service above and the Privacy Policy.
 REGISTRATION_TITLE_MSG=Please, fill the fields and become a member of WiseMapping community. Registration is <b> Free</b> and takes just a moment.
-CAPTCHA_ERROR=Enter the letters as they are shown in the image above.
 CREATOR=Creator
 CREATION_TIME=Creation Time
 EDITORS=Editors
@ -218,7 +217,7 @@ DESELECT_ALL_TOPIC=Deselect All Topic
 SHORTCUTS=Shortcuts
 COLLAPSE_CHILDREN=Collapse Children
 KEYBOARD_SHORTCUTS_MSG=Keyboard shortcuts can help you save time by allowing you to never take your hands off the keyboard to use the mouse.
-COPY_AND_PASTE_TOPICS=Copy and Page Topics
+COPY_AND_PASTE_TOPICS=Copy and Paste Topics
 MULTIPLE_LINES=Add multiple text lines
 TERM_OF_USE=Terms and Conditions

--- a/wise-webapp/src/main/resources/messages_es.properties
+++ b/wise-webapp/src/main/resources/messages_es.properties
@ -52,7 +52,6 @@ PASSWORD_MISSMATCH=La contraseña no concuerda
 WISEMAPPING_ACCOUNT_MESSAGE=Por favor, verifique la información que ha ingresado y lea las condiciones del servicio.
 REGISTRATION_CLICK_ADVICE= Seleccionando 'Registración' esta aceptando las condiciones de uso de arriba y la politica de privacidad.
 REGISTRATION_TITLE_MSG=Complete el siguiente formulario para convertirse en un miembro de la comunidad de WiseMapping. </br>La registración es <strong>Gratis</strong> y sólo toma un momento.
-CAPTCHA_ERROR=Ingrese los caracteres tal como son mostrados en la imagen arriba.
 CREATOR=Creador
 CREATION_TIME=Fecha de creación
 EDITORS=Editores
--- a/wise-webapp/src/main/resources/messages_fr.properties
+++ b/wise-webapp/src/main/resources/messages_fr.properties
@ -69,7 +69,6 @@ CHANGE_PASSWORD_SUCCESS=Votre mot de passe a été changé avec succès.
 WISEMAPPING_ACCOUNT_MESSAGE=Merci de vérifier l'information de Compte WiseMapping que vous avez saisie, et de relire les conditions de service
 REGISTRATION_CLICK_ADVICE=En cliquant "M'enregistrer" ci-dessous, vous acceptez les conditions de service ci-dessus ainsi que les règles de confidentialité.
 REGISTRATION_TITLE_MSG=Devenez membre de la communauté WiseMapping en remplissant les champs ci-dessous. L'inscription est <b> gratuite </b> et ne prend qu'un instant. 
-CAPTCHA_ERROR=Saisissez les caractères affichés dans l'image ci-dessus. 
 CREATOR=Créateur
 CREATION_TIME=Heure de création
 EDITORS=Editeurs
--- a/wise-webapp/src/main/resources/messages_it.properties
+++ b/wise-webapp/src/main/resources/messages_it.properties
@ -64,7 +64,6 @@ CHANGE_PASSWORD_SUCCESS=La password è stata cambiata correttamente
 WISEMAPPING_ACCOUNT_MESSAGE=Prego, controllare le informazioni del tuo account WiseMapping appena inserite, e prendi note dei Termini di Servizio
 REGISTRATION_CLICK_ADVICE= Cliccando su 'Registra' di seguito, si accettano i Termini di Servizio riportati e le Privacy Policy di cui sopra.
 REGISTRATION_TITLE_MSG=Prego, compilare tutti i campi per diventare membri della Community WiseMapping. La registrazione è <strong> Free</strong> richiede pochi istanti.
-CAPTCHA_ERROR=Inserire le lettere così come appaiono sull'immagine riportata qui sopra.
 CREATOR=Creatore
 CREATION_TIME=Orario di creazione
 EDITORS=Editori
--- a/wise-webapp/src/main/resources/messages_pt_BR.properties
+++ b/wise-webapp/src/main/resources/messages_pt_BR.properties
@ -62,7 +62,6 @@ CHANGE_PASSWORD_SUCCESS=Sua senha foi alterada com sucesso.
 WISEMAPPING_ACCOUNT_MESSAGE=Confira a informação da conta WiseMapping que você inseriu acima e reveja os Termos de Serviço.
 REGISTRATION_CLICK_ADVICE= Clicando em Registrar abaixo você está concordando com os Termos de Seviço acima e a Política de Privacidade.
 REGISTRATION_TITLE_MSG=Preencha os campos e toene-se membro da comunidade WiseMapping. O Registro é <b> Gratuito</b> e leva só alguns instantes.
-CAPTCHA_ERROR=Digite as letras como são exibidas na imagem acima.
 CREATOR=Criador
 CREATION_TIME=Tempo de Criação
 EDITORS=Editores
--- a/wise-webapp/src/main/resources/messages_zh_CN.properties
+++ b/wise-webapp/src/main/resources/messages_zh_CN.properties
@ -63,7 +63,6 @@ CHANGE_PASSWORD_SUCCESS=密码修改成功!
 WISEMAPPING_ACCOUNT_MESSAGE=请检查已输入的账户信息，并查阅服务条款
 REGISTRATION_CLICK_ADVICE= 点击下面的“注册”，表示你同意上面提到的服务条款和隐私政策。
 REGISTRATION_TITLE_MSG=请填写表单，你将成为WiseMapping社区的一员。注册<b> 免费</b> 快速。
-CAPTCHA_ERROR=输入你在上面的图像中看到的字符。
 CREATOR=创建者
 CREATION_TIME=创建时间
 EDITORS=编辑者
--- a/wise-webapp/src/main/resources/messages_zh_TW.properties
+++ b/wise-webapp/src/main/resources/messages_zh_TW.properties
@ -64,7 +64,6 @@ CHANGE_PASSWORD_SUCCESS=密碼修改成功!
 WISEMAPPING_ACCOUNT_MESSAGE=請檢查已輸入的帳戶資訊，並查閱服務條款
 REGISTRATION_CLICK_ADVICE= 點擊下麵的“註冊”，表示你同意上面提到的服務條款和隱私政策。
 REGISTRATION_TITLE_MSG=請填寫表單，你將成為WiseMapping社區的一員。註冊<b> 免費</b> 快速。
-CAPTCHA_ERROR=輸入你在上面的圖像中看到的字元。
 CREATOR=創建者
 CREATION_TIME=創建時間
 EDITORS=編輯者
--- a/wise-webapp/src/main/webapp/WEB-INF/app.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/app.properties
@ -75,12 +75,12 @@ mail.errorReporterEmail=
 ##################################################################################

 # Enable captcha confirmation
-google.recaptcha.enabled = true
+google.recaptcha2.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
+google.recaptcha2.siteKey = 6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI
+google.recaptcha2.secretKey =  6LeIxAcTAAAAAGG-vFI1TnRWxMZNFuojJ4WifJWe

 ##################################################################################
 # Site configuration
--- a/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
@ -4,6 +4,7 @@ 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.logger.org.hibernate.SQL=WARN,stdout,R


--- a/wise-webapp/src/main/webapp/WEB-INF/heroku.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/heroku.properties
@ -1,62 +0,0 @@
-##################################################################################
-# Database Configuration
-##################################################################################
-
-# MySQL 5.X configuration properties
-database.url=${DATABASE_URL}
-database.driver=${DATABASE_DRIVER}
-database.hibernate.dialect=${DATABASE_HIBERNATE_DIALECT}
-database.username=${DATABASE_USERNAME}
-database.password=${DATABASE_PASSWORD}
-
-#------------------------
-# Sendgrid Configuration
-#------------------------
-mail.smtp.port=587
-mail.smtp.host=smtp.sendgrid.net
-mail.username=${SENDGRID_USERNAME}
-mail.password=${SENDGRID_PASSWORD}
-mail.smtp.auth=true
-mail.smtp.starttls.enable=true
-mail.smtp.quitwait=false
-
-# Required: "from" email account that will appear in the emails sent from the sender.
-mail.serverSendEmail=daemon@wisemapping.herokuapp.com
-
-# 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=support@wisemapping.com
-
-# Optional: Unexpected errors will be reported to this address.
-mail.errorReporterEmail=bug-report@wisemapping.com
-
-##################################################################################
-# Users Registration  Configuration
-##################################################################################
-
-# Enable/Disable user registration confirmation by e-mail. If it's enabled, mail must be configured.
-registration.email.enabled = false
-
-# 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
-
-# Site URL. This url will be used during sharing emails and public views.
-site.baseurl = http://http://wisemapping.herokuapp.com:8080
-
-##################################################################################
-# Google Analytics Settings
-##################################################################################
-google.analytics.enabled=false
-google.analytics.account=UA-XXXX
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml
@ -6,7 +6,7 @@
       xsi:schemaLocation="http://www.springframework.org/schema/beans
          http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
          http://www.springframework.org/schema/security
-          http://www.springframework.org/schema/security/spring-security-3.1.xsd">
+          http://www.springframework.org/schema/security/spring-security-3.2.xsd">

    <sec:authentication-manager alias="authenticationManager">
        <sec:authentication-provider ref="dbAuthenticationProvider"/>
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml
@ -5,7 +5,7 @@
       xsi:schemaLocation="http://www.springframework.org/schema/beans
          http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
          http://www.springframework.org/schema/security
-          http://www.springframework.org/schema/security/spring-security-3.1.xsd">
+          http://www.springframework.org/schema/security/spring-security-3.2.xsd">


    <sec:authentication-manager>
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
@ -6,7 +6,7 @@
       xsi:schemaLocation="http://www.springframework.org/schema/beans
          http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
          http://www.springframework.org/schema/security
-          http://www.springframework.org/schema/security/spring-security-3.1.xsd">
+          http://www.springframework.org/schema/security/spring-security-3.2.xsd">

    <sec:http pattern="/css/**" security="none"/>
    <sec:http pattern="/js/**" security="none"/>
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
@ -43,6 +43,10 @@
        <property name="adminUser" value="${admin.user}"/>
    </bean>

+    <bean id="recaptchaService" class="com.wisemapping.service.RecaptchaService">
+        <property name="recaptchaSecret" value="${google.recaptcha2.secretKey}"/>
+    </bean>
+
    <bean id="mindmapService" class="org.springframework.aop.framework.ProxyFactoryBean">
        <property name="proxyInterfaces" value="com.wisemapping.service.MindmapService"/>
        <property name="interceptorNames">
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
@ -86,12 +86,6 @@
          class="org.springframework.web.servlet.i18n.SessionLocaleResolver">
    </bean>

-    <bean id="reCaptcha" class="net.tanesha.recaptcha.ReCaptchaImpl">
-        <property name="privateKey" value="${google.recaptcha.privateKey}"/>
-        <property name="publicKey" value="${google.recaptcha.publicKey}"/>
-        <property name="includeNoscript" value="false"/>
-    </bean>
-
    <bean id="multipartResolver"
          class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
        <!-- one of the properties available; the maximum file size in bytes -->
--- a/wise-webapp/src/main/webapp/jsp/template.jsp
+++ b/wise-webapp/src/main/webapp/jsp/template.jsp
@ -24,7 +24,6 @@
    <meta property="og:url" content="http://www.wisemapping.com"/>
    <meta property="og:image" content="http://www.wisemapping.com/images/logo.png"/>
    <meta property="og:site_name" content="WiseMapping.com"/>
-
    <title>
        <spring:message code="SITE.TITLE"/>-
        <c:choose>
@ -44,6 +43,8 @@

    <script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.min.js"></script>
    <script src="js/less.js" type="text/javascript"></script>
+    <script src='https://www.google.com/recaptcha/api.js'></script>
+
 </head>
 <body>

--- a/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userRegistration.jsp
@ -47,11 +47,9 @@
    </div>
    <div class="form-group">
        <div class="col-md-10 col-md-offset-2">
-            <c:if test="${requestScope.captchaEnabled}">
-                ${requestScope.captchaHtml}
-                <p>
-                    <form:errors path="captcha" cssClass="errorMsg"/>
-                </p>
+            <c:if test="${requestScope.recaptchaEnabled}">
+                <div class="g-recaptcha" data-sitekey="${requestScope.recaptchaSiteKey}"></div>
+                <p>${requestScope.captcha}</p>
            </c:if>
        </div>
    </div>
--- 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...");
        }

--- 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 {
--- a/wise-webapp/src/test/resources/data/export/bigmap.doc
+++ b/wise-webapp/src/test/resources/data/export/bigmap.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>corona</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/bigmap.odt
+++ b/wise-webapp/src/test/resources/data/export/bigmap.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/bug2.doc
+++ b/wise-webapp/src/test/resources/data/export/bug2.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>SaberMás</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/bug2.odt
+++ b/wise-webapp/src/test/resources/data/export/bug2.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/bug3.doc
+++ b/wise-webapp/src/test/resources/data/export/bug3.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>Indicator needs</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/bug3.odt
+++ b/wise-webapp/src/test/resources/data/export/bug3.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>Observation</o:Title>
 </o:DocumentProperties>
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/complex.doc
+++ b/wise-webapp/src/test/resources/data/export/complex.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>PPM Plan</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/complex.odt
+++ b/wise-webapp/src/test/resources/data/export/complex.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/emptyNodes.doc
+++ b/wise-webapp/src/test/resources/data/export/emptyNodes.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title/>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/emptyNodes.odt
+++ b/wise-webapp/src/test/resources/data/export/emptyNodes.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/enc.doc
+++ b/wise-webapp/src/test/resources/data/export/enc.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>Artigos GF comentários interessantes</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/enc.odt
+++ b/wise-webapp/src/test/resources/data/export/enc.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/huge.doc
+++ b/wise-webapp/src/test/resources/data/export/huge.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>I Care</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/huge.odt
+++ b/wise-webapp/src/test/resources/data/export/huge.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/i18n.doc
+++ b/wise-webapp/src/test/resources/data/export/i18n.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>i18n</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/i18n.odt
+++ b/wise-webapp/src/test/resources/data/export/i18n.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/i18n2.doc
+++ b/wise-webapp/src/test/resources/data/export/i18n2.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>أَبْجَدِيَّة عَرَبِيَّة</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/i18n2.odt
+++ b/wise-webapp/src/test/resources/data/export/i18n2.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/issue.doc
+++ b/wise-webapp/src/test/resources/data/export/issue.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>La computadora</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/issue.odt
+++ b/wise-webapp/src/test/resources/data/export/issue.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/longnodes.doc
+++ b/wise-webapp/src/test/resources/data/export/longnodes.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>I have HTML In Nodes</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/longnodes.odt
+++ b/wise-webapp/src/test/resources/data/export/longnodes.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/npe.doc
+++ b/wise-webapp/src/test/resources/data/export/npe.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title/>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/npe.odt
+++ b/wise-webapp/src/test/resources/data/export/npe.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/process.doc
+++ b/wise-webapp/src/test/resources/data/export/process.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>California</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/process.odt
+++ b/wise-webapp/src/test/resources/data/export/process.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/sample2.doc
+++ b/wise-webapp/src/test/resources/data/export/sample2.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>Prospace</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/sample2.odt
+++ b/wise-webapp/src/test/resources/data/export/sample2.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/sample3.doc
+++ b/wise-webapp/src/test/resources/data/export/sample3.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>Clickview Overview</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/sample3.odt
+++ b/wise-webapp/src/test/resources/data/export/sample3.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/sample4.doc
+++ b/wise-webapp/src/test/resources/data/export/sample4.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>Clickview Overview</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/sample4.odt
+++ b/wise-webapp/src/test/resources/data/export/sample4.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>Así que quieres recorrer Medellín...</o:Title>
 </o:DocumentProperties>
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>Welcome To WiseMapping</o:Title>
 </o:DocumentProperties>
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- a/wise-webapp/src/test/resources/data/export/welcome.doc
+++ b/wise-webapp/src/test/resources/data/export/welcome.doc
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:o="urn:schemas-microsoft-com:office:office">
+<?mso-application progid="Word.Document"?><w:wordDocument xmlns:sl="http://schemas.microsoft.com/schemaLibrary/2003/core" xmlns:w="http://schemas.microsoft.com/office/word/2003/wordml" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:wx="http://schemas.microsoft.com/office/word/2003/auxHint" xmlns:aml="http://schemas.microsoft.com/aml/2001/core" xmlns:o="urn:schemas-microsoft-com:office:office">
 <o:DocumentProperties>
 <o:Title>Welcome To WiseMapping</o:Title>
 </o:DocumentProperties>
--- a/wise-webapp/src/test/resources/data/export/welcome.odt
+++ b/wise-webapp/src/test/resources/data/export/welcome.odt
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="UTF-8"?><office:document-content office:version="1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns="http://www.w3.org/1999/xhtml">
 <office:scripts/>
 <office:font-face-decls>
 <style:font-face style:name="StarSymbol" svg:font-family="StarSymbol"/>
--- 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 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="1499.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-724.0 -746.0 1474.0 1499.0" width="1474.0">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="1499.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-724.0 -746.0 1474.0 1499.0" width="1474.0">
    <path d="M-158,567 C-168,567 -178,689 -188,689" fill="#495879" fill-opacity="1" stroke="#495879" stroke-opacity="1" stroke-width="1px" style="fill:none " visibility="visible"/>
    <path d="M-158,567 C-168,567 -178,662 -188,662" fill="#495879" fill-opacity="1" stroke="#495879" stroke-opacity="1" stroke-width="1px" style="fill:none " visibility="visible"/>
    <path d="M-158,567 C-168,567 -178,635 -188,635" fill="#495879" fill-opacity="1" stroke="#495879" stroke-opacity="1" stroke-width="1px" style="fill:none " visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/bug1-exp.svg
+++ b/wise-webapp/src/test/resources/data/svg/bug1-exp.svg
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="665.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-589.0 -329.0 1250.0 665.0" width="1250.0">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="665.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-589.0 -329.0 1250.0 665.0" width="1250.0">
    <path d="M-384,78 C-393,78 -404,92 -413,92" fill="#495879" fill-opacity="1" stroke="#495879" stroke-opacity="1" stroke-width="1px" style="fill:none " visibility="visible"/>
    <path d="M-384,78 C-393,78 -403,63 -412,63" fill="#495879" fill-opacity="1" stroke="#495879" stroke-opacity="1" stroke-width="1px" style="fill:none " visibility="visible"/>
    <path d="M-196,78 C-205,78 -216,77 -225,77" fill="#495879" fill-opacity="1" stroke="#495879" stroke-opacity="1" stroke-width="1px" style="fill:none " visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/bug3-exp.svg
+++ b/wise-webapp/src/test/resources/data/svg/bug3-exp.svg
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="2651.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-1332.0 -789.0 2836.0 2651.0" width="2836.0">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="2651.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-1332.0 -789.0 2836.0 2651.0" width="2836.0">
    <path d="M-318,1380 C-91.33333333333331,1390.3333333333333 135.33333333333331,1400.6666666666667 362,1411" stroke="#3f96ff" stroke-opacity="1" stroke-width="2px" style="fill:none " visibility="hidden"/>
    <path d="M-318,1414 L-313.67703992075633,1409.8392288991984M-318,1414 L-313.8392288991984,1418.3229600792436" stroke="#9b74e6" stroke-opacity="1" stroke-width="2px" visibility="visible"/>
    <path d="M716,674 C346,845 -668,871 -741,968" stroke="#3f96ff" stroke-opacity="1" stroke-width="2px" style="fill:none " visibility="hidden"/>
--- a/wise-webapp/src/test/resources/data/svg/bug3.svg
+++ b/wise-webapp/src/test/resources/data/svg/bug3.svg
@ -1,4 +1,4 @@
-<svg focusable="true" id="workspace" preserveAspectRatio="none" width="1280" height="800"
+<svg xmlns="http://www.w3.org/2000/svg" focusable="true" id="workspace" preserveAspectRatio="none" width="1280" height="800"
     viewBox="-840.5845389060414 -343.35139188528564 2389.58781353226 1493.4923834576625">
    <path style="fill:none " stroke-width="2px" stroke="#3f96ff" stroke-opacity="1" visibility="hidden"
          d="M-318,1380 C-91.33333333333331,1390.3333333333333 135.33333333333331,1400.6666666666667 362,1411"></path>
--- a/wise-webapp/src/test/resources/data/svg/export-exp.svg
+++ b/wise-webapp/src/test/resources/data/svg/export-exp.svg
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="345.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-595.0 -169.0 1191.0 345.0" width="1191.0">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="345.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-595.0 -169.0 1191.0 345.0" width="1191.0">
 <path stroke="#3f96ff" stroke-opacity="1" stroke-width="2px" style="fill:none " visibility="hidden"/>
 <path d="M-200,-36 L-195.70774292476682,-31.807562856748987M-200,-36 L-204.19243714325103,-31.70774292476682" stroke="#9b74e6" stroke-opacity="1" stroke-width="2px" visibility="visible"/>
 <path d="M-265,72 C-274,72 -285,107 -294,107" fill="#495879" fill-opacity="1" stroke="#495879" stroke-opacity="1" stroke-width="1px" style="fill:none " visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/export.svg
+++ b/wise-webapp/src/test/resources/data/svg/export.svg
--- a/wise-webapp/src/test/resources/data/svg/map-3.0-exp.svg
+++ b/wise-webapp/src/test/resources/data/svg/map-3.0-exp.svg
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="308.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-341.0 -151.0 527.0 308.0" width="527.0">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="308.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-341.0 -151.0 527.0 308.0" width="527.0">
    <path d="M0,0 C-20,0 -41,101 -61,101 -41,104 -20,5 0,7 Z" fill="#495879" fill-opacity="1" stroke="#495879" stroke-opacity="1" stroke-width="1px" style="fill:#495879 " visibility="visible"/>
    <path d="M-132,45 C-141,45 -152,68 -161,68" fill="#495879" fill-opacity="1" stroke="#495879" stroke-opacity="1" stroke-width="1px" style="fill:none " visibility="visible"/>
    <path d="M-212,29 C-221,29 -232,41 -241,41" fill="#495879" fill-opacity="1" stroke="#495879" stroke-opacity="1" stroke-width="1px" style="fill:none " visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/map-3.0.svg
+++ b/wise-webapp/src/test/resources/data/svg/map-3.0.svg
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg  focusable="true" height="384.0"
+<svg xmlns="http://www.w3.org/2000/svg"  focusable="true" height="384.0"
     id="workspace" preserveAspectRatio="xMinYMin" viewBox="-345.0 -130.0 690.0 260.0" width="512.0">
    <path d="M0,0 C-20,0 -41,101 -61,101 -41,104 -20,5 0,7 Z" fill="#495879" fill-opacity="1" stroke="#495879"
          stroke-opacity="1" stroke-width="1px" style="fill:#495879 " visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/map1-exp.svg
+++ b/wise-webapp/src/test/resources/data/svg/map1-exp.svg
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="411.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-650.0 -193.0 1076.0 411.0" width="1076.0">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="411.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-650.0 -193.0 1076.0 411.0" width="1076.0">
    <polyline fill="none" points="-492,161.5 -599.5,160.5" stroke="#495879" stroke-opacity="1" stroke-width="1px" visibility="visible"/>
    <polyline fill="none" points="-348,150 -358,150 -358,156.5 -363,161.5 -491,161.5" stroke="#495879" stroke-opacity="1" stroke-width="1px" visibility="visible"/>
    <polyline fill="none" points="-348,150 -358,150 -358,139.5 -363,134.5 -489.5,134.5" stroke="#495879" stroke-opacity="1" stroke-width="1px" visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/map1.svg
+++ b/wise-webapp/src/test/resources/data/svg/map1.svg
@ -1,4 +1,4 @@
-<svg focusable="true" id="workspace" width="1600" height="508" viewBox="-806.4 -256.032 1612.8 512.064"
+<svg xmlns="http://www.w3.org/2000/svg" focusable="true" id="workspace" width="1600" height="508" viewBox="-806.4 -256.032 1612.8 512.064"
     preserveAspectRatio="none">
    <polyline fill="none" stroke-width="1px" stroke="#495879" stroke-opacity="1" points="-492,161.5 -599.5,160.5"
              visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/map2-exp.svg
+++ b/wise-webapp/src/test/resources/data/svg/map2-exp.svg
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="2382.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-1131.0 -1134.0 2173.0 2382.0" width="2173.0">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="2382.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-1131.0 -1134.0 2173.0 2382.0" width="2173.0">
    <polyline fill="none" points="645.0, 85.0 760.0, 84.0" stroke="#495879" stroke-opacity="1" stroke-width="1px" visibility="visible"/>
    <polyline fill="none" points="531.0, 23.0 541.0, 23.0 541.0, 80.0 546.0, 85.0 644.0, 85.0" stroke="#495879" stroke-opacity="1" stroke-width="1px" visibility="visible"/>
    <polyline fill="none" points="531.0, 23.0 541.0, 23.0 541.0, 53.0 546.0, 58.0 738.5, 58.0" stroke="#495879" stroke-opacity="1" stroke-width="1px" visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/map2.svg
+++ b/wise-webapp/src/test/resources/data/svg/map2.svg
@ -1,4 +1,4 @@
-<svg focusable="true" height="384.0" id="workspace" preserveAspectRatio="xMinYMin"
+<svg xmlns="http://www.w3.org/2000/svg" focusable="true" height="384.0" id="workspace" preserveAspectRatio="xMinYMin"
     viewBox="-1250.0 -1198.0 2500.0 2396.0" width="512.0">
    <polyline fill="none" points="645.0, 85.0 760.0, 84.0" stroke="#495879" stroke-opacity="1" stroke-width="1px"
              visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/map3-exp.svg
+++ b/wise-webapp/src/test/resources/data/svg/map3-exp.svg
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="464.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-696.0 -246.0 1220.0 464.0" width="1220.0">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="464.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-696.0 -246.0 1220.0 464.0" width="1220.0">
    <polyline fill="none" points="306,51.5 316,51.5 316,69.5 321,74.5 353.5,74.5" stroke="#495879" stroke-opacity="1" stroke-width="1px" visibility="visible"/>
    <polyline fill="none" points="306,51.5 361.5,50.5" stroke="#495879" stroke-opacity="1" stroke-width="1px" visibility="visible"/>
    <polyline fill="none" points="306,51.5 316,51.5 316,31.5 321,26.5 377,26.5" stroke="#495879" stroke-opacity="1" stroke-width="1px" visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/map3.svg
+++ b/wise-webapp/src/test/resources/data/svg/map3.svg
@ -1,4 +1,4 @@
-<svg focusable="true" id="workspace" width="1600" height="307"
+<svg xmlns="http://www.w3.org/2000/svg" focusable="true" id="workspace" width="1600" height="307"
     viewBox="-560 -107.44999999999999 1120 214.89999999999998" preserveAspectRatio="none">
    <polyline fill="none" stroke-width="1px" stroke="#495879" stroke-opacity="1"
              points="306,51.5 316,51.5 316,69.5 321,74.5 353.5,74.5" visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/map4-exp.svg
+++ b/wise-webapp/src/test/resources/data/svg/map4-exp.svg
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="464.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-731.0 -246.0 1269.0 464.0" width="1269.0">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="464.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-731.0 -246.0 1269.0 464.0" width="1269.0">
    <polyline fill="none" points="320,51.5 330,51.5 330,69.5 335,74.5 367.5,74.5" stroke="#495879" stroke-opacity="1" stroke-width="1px" visibility="visible"/>
    <polyline fill="none" points="320,51.5 375.5,50.5" stroke="#495879" stroke-opacity="1" stroke-width="1px" visibility="visible"/>
    <polyline fill="none" points="320,51.5 330,51.5 330,31.5 335,26.5 391,26.5" stroke="#495879" stroke-opacity="1" stroke-width="1px" visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/map4.svg
+++ b/wise-webapp/src/test/resources/data/svg/map4.svg
@ -1,4 +1,4 @@
-<svg focusable="true" id="workspace" width="1600" height="307"
+<svg xmlns="http://www.w3.org/2000/svg" focusable="true" id="workspace" width="1600" height="307"
     viewBox="-560 -107.44999999999999 1120 214.89999999999998" preserveAspectRatio="none">
    <polyline fill="none" stroke-width="1px" stroke="#495879" stroke-opacity="1"
              points="320,51.5 330,51.5 330,69.5 335,74.5 367.5,74.5" visibility="visible"/>
--- a/wise-webapp/src/test/resources/data/svg/map5-exp.svg
+++ b/wise-webapp/src/test/resources/data/svg/map5-exp.svg
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="151.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-224.0 -101.0 274.0 151.0" width="274.0">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="151.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-224.0 -101.0 274.0 151.0" width="274.0">
    <path d="M0,0 C-38,0 -54,-40 -92,-40" fill-opacity="1.0999999999999999" stroke="#495879" stroke-opacity="1.0999999999999999" stroke-width="1px" style="fill: none;" visibility="visible"/>
    <g focusable="true" height="100" preserveAspectRatio="none" transform="translate(-23, -17) scale(1)" visibility="visible" width="100">
        <rect fill="#dbe2e6" fill-opacity="0" height="41" rx="6.1499999999999995" ry="6.1499999999999995" stroke="#77555a" stroke-opacity="0" stroke-width="1px" style="cursor: default;" width="50" x="-2" y="-3"/>
--- a/wise-webapp/src/test/resources/data/svg/map5.svg
+++ b/wise-webapp/src/test/resources/data/svg/map5.svg
@ -1,4 +1,4 @@
-<svg preserveAspectRatio="none" viewBox="-560 -98.69999999999999 1120 197.39999999999998" height="282" width="1600"
+<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="none" viewBox="-560 -98.69999999999999 1120 197.39999999999998" height="282" width="1600"
     id="workspace" focusable="true">
    <path fill-opacity="1.0999999999999999" visibility="visible" d="M0,0 C-38,0 -54,-40 -92,-40"
          stroke-opacity="1.0999999999999999" stroke="#495879" stroke-width="1px" style="fill: none;"></path>
--- a/wise-webapp/src/test/resources/data/svg/map6-exp.svg
+++ b/wise-webapp/src/test/resources/data/svg/map6-exp.svg
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="1595.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-869.0 -830.0 3515.0 1595.0" width="3515.0">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="true" height="1595.0" id="workspace" preserveAspectRatio="xMinYMin" viewBox="-869.0 -830.0 3515.0 1595.0" width="3515.0">
    <path stroke="#3f96ff" stroke-opacity="1" stroke-width="2px" style="fill:none " visibility="hidden"/>
    <path d="M1517,159 L1518.3491570401925,153.15365282583227M1517,159 L1522.8463471741677,160.34915704019255" stroke="#9b74e6" stroke-opacity="1" stroke-width="2px" visibility="visible"/>
    <path stroke="#3f96ff" stroke-opacity="1" stroke-width="2px" style="fill:none " visibility="hidden"/>
--- a/wise-webapp/src/test/resources/data/svg/map6.svg
+++ b/wise-webapp/src/test/resources/data/svg/map6.svg
@ -1,4 +1,4 @@
-<svg focusable="true" id="workspace" preserveAspectRatio="none" width="1440" height="900"
+<svg xmlns="http://www.w3.org/2000/svg" focusable="true" id="workspace" preserveAspectRatio="none" width="1440" height="900"
     viewBox="-1301.3428722423528 -446.4272510599649 2544.608091599515 1590.3800572496968">
    <path style="fill:none " stroke-width="2px" stroke="#3f96ff" stroke-opacity="1" visibility="hidden"></path>
    <path stroke-width="2px" stroke="#9b74e6" stroke-opacity="1" visibility="visible"