From e4af8acdc27c9bc84a9ffa8c2d078eeb9587cfa4 Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Sat, 7 Nov 2020 11:56:38 -0800
Subject: [PATCH] Initial commit

---
 core-js/pom.xml                               |  2 +-
 distribution/docker-conf/app.properties       | 49 +++++++----
 mindplot/pom.xml                              |  2 +-
 pom.xml                                       |  4 +-
 web2d/pom.xml                                 |  2 +-
 wise-editor/pom.xml                           |  2 +-
 wise-webapp/pom.xml                           | 25 +++++-
 .../com/wisemapping/dao/LabelManagerImpl.java | 38 +++++++--
 .../wisemapping/dao/MindmapManagerImpl.java   | 82 ++++++++++++-------
 .../com/wisemapping/dao/UserManagerImpl.java  | 75 ++++++++++-------
 .../java/com/wisemapping/mail/Mailer.java     | 46 +++++------
 .../wisemapping/rest/MindmapController.java   | 66 +++++++--------
 .../wisemapping/rest/view/TransformView.java  | 47 +++++------
 .../security/AuthenticationProvider.java      | 39 ++++-----
 .../security/CustomPasswordEncoder.java       | 68 +++++++--------
 .../wisemapping/service/UserServiceImpl.java  | 60 ++++++--------
 .../wisemapping/util/VelocityEngineUtils.java | 38 +++++++++
 .../util/VelocityEngineWrapper.java           | 24 ++++++
 wise-webapp/src/main/webapp/WEB-INF/web.xml   |  2 +-
 .../main/webapp/WEB-INF/wisemapping-aop.xml   | 10 +--
 .../main/webapp/WEB-INF/wisemapping-dao.xml   | 29 +++----
 .../main/webapp/WEB-INF/wisemapping-rest.xml  |  6 +-
 .../WEB-INF/wisemapping-security-db.xml       |  4 +-
 .../WEB-INF/wisemapping-security-ldap.xml     |  4 +-
 .../webapp/WEB-INF/wisemapping-security.xml   |  4 +-
 .../webapp/WEB-INF/wisemapping-service.xml    | 28 ++-----
 .../webapp/WEB-INF/wisemapping-servlet.xml    |  8 +-
 27 files changed, 436 insertions(+), 328 deletions(-)
 create mode 100644 wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineUtils.java
 create mode 100644 wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineWrapper.java

diff --git a/core-js/pom.xml b/core-js/pom.xml
index 2d8eda6a..84e1398a 100644
--- a/core-js/pom.xml
+++ b/core-js/pom.xml
@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>4.0.6-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
     <scm>
         <developerConnection>scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git</developerConnection>
diff --git a/distribution/docker-conf/app.properties b/distribution/docker-conf/app.properties
index db8ada22..9620b810 100644
--- a/distribution/docker-conf/app.properties
+++ b/distribution/docker-conf/app.properties
@@ -2,25 +2,44 @@
 # Database Configuration
 ##################################################################################
 
-# MySQL 5.X configuration properties
-database.url=jdbc:mysql://localhost/wisemapping?useUnicode=yes&characterEncoding=UTF-8
-database.driver=com.mysql.jdbc.Driver
-database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+# MariaDB configuration properties
+database.url=jdbc:mariadb://localhost/wisemapping?useUnicode=yes&characterEncoding=UTF-8
+database.driver=org.mariadb.jdbc.Driver
+database.hibernate.dialect=org.hibernate.dialect.MariaDBDialect
 database.username=wisemapping
-database.password=password
+database.password=mappingwise
 database.validation.enabled=true
 database.validation.query=SELECT 1
 
-## PostgreSQL  configuration properties
-#database.url=jdbc:postgresql://<hostname:port>/wisemapping
-#database.driver=org.postgresql.Driver
-#database.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-#database.username=<username>
-#database.password=<password>
+# MySQL 5.X configuration properties
+#database.url=jdbc:mysql://localhost/wisemapping?useUnicode=yes&characterEncoding=UTF-8
+#database.driver=com.mysql.jdbc.Driver
+#database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+#database.username=wisemapping
+#database.password=password
 #database.validation.enabled=true
+#database.validation.query=SELECT 1
+
+
+## PostgreSQL  configuration properties
+#database.url=jdbc:mariadb://localhost:3306/wisemapping
+#database.driver=org.mariadb.jdbc.Driver
+#database.hibernate.dialect=org.hibernate.dialect.MariaDBDialect
+#database.username=wisemapping
+#database.password=password
 #database.validation.query=
 #database.validation.enabled=false
 
+
+# HSQL Configuration properties
+#database.url=jdbc:hsqldb:file:${database.base.url}/db/wisemapping
+#database.driver=org.hsqldb.jdbc.JDBCDriver
+#database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
+#database.username=sa
+#database.password=
+#database.validation.enabled=false
+#database.validation.query=
+
 ##################################################################################
 # Mail configuration. Must be configured to enable user registration confirmation.
 ##################################################################################
@@ -135,13 +154,7 @@ security.openid.enabled=false
 #
 # This properties are used for REST API Documentation( http://localhost:8080/wisemapping/doc/rest/index.html)
 # Change the URL for proper documentation console setup.
-documentation.services.basePath=http://localhost:8080/wisemapping/service
+documentation.services.basePath=http://localhost:8080/service
 documentation.services.version=3.0.1
 
 
-
-
-
-
-
-
diff --git a/mindplot/pom.xml b/mindplot/pom.xml
index b99f3d5e..6ad88e9b 100644
--- a/mindplot/pom.xml
+++ b/mindplot/pom.xml
@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>4.0.6-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index e211621c..25e2cbd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <properties>
-        <com.wisemapping.version>4.0.6-SNAPSHOT</com.wisemapping.version>
+        <com.wisemapping.version>5.0.0-SNAPSHOT</com.wisemapping.version>
         <superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
     </properties>
 
@@ -16,7 +16,7 @@
     <groupId>org.wisemapping</groupId>
     <artifactId>wisemapping</artifactId>
     <name>WiseMapping Project</name>
-    <version>4.0.6-SNAPSHOT</version>
+    <version>5.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <licenses>
diff --git a/web2d/pom.xml b/web2d/pom.xml
index 5017df69..87166f03 100644
--- a/web2d/pom.xml
+++ b/web2d/pom.xml
@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>4.0.6-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/wise-editor/pom.xml b/wise-editor/pom.xml
index dddf61f4..3aea50d7 100644
--- a/wise-editor/pom.xml
+++ b/wise-editor/pom.xml
@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>4.0.6-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index ec0abb55..698dd9fc 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -9,7 +9,7 @@
         <groupId>org.wisemapping</groupId>
         <artifactId>wisemapping</artifactId>
         <relativePath>../pom.xml</relativePath>
-        <version>4.0.6-SNAPSHOT</version>
+        <version>5.0.0-SNAPSHOT</version>
     </parent>
 
     <repositories>
@@ -28,8 +28,10 @@
     </repositories>
 
     <properties>
-        <org.springframework.version>4.3.29.RELEASE</org.springframework.version>
-        <org.springframework.addons>4.2.9.RELEASE</org.springframework.addons>
+        <org.springframework.version>5.2.10.RELEASE</org.springframework.version>
+        <org.springframework.addons>5.2.5.RELEASE</org.springframework.addons>
+        <hibernate.version>5.4.23.Final</hibernate.version>
+
     </properties>
 
     <dependencies>
@@ -101,6 +103,23 @@
             <version>${org.springframework.version}</version>
             <scope>compile</scope>
         </dependency>
+        <!-- Hibernate -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${org.springframework.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/LabelManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/LabelManagerImpl.java
index 926134ff..e241b043 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/LabelManagerImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/LabelManagerImpl.java
@@ -1,10 +1,27 @@
+/*
+ *    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.dao;
 
 import com.wisemapping.model.Label;
 import com.wisemapping.model.User;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
 
 import java.util.List;
 
@@ -18,27 +35,34 @@ public class LabelManagerImpl extends HibernateDaoSupport
 
     @Override
     public void saveLabel(@NotNull final Label label) {
-        getSession().save(label);
+        currentSession().save(label);
     }
 
     @NotNull
     @Override
+    @SuppressWarnings("unchecked")
     public List<Label> getAllLabels(@NotNull final User user) {
-        return (List<Label>) getHibernateTemplate().find("from com.wisemapping.model.Label wisemapping where creator_id=?", user.getId());
+        var query = currentSession().createQuery("from com.wisemapping.model.Label wisemapping where creator_id=:creatorId");
+        query.setParameter("creatorId", user.getId());
+        return query.list();
     }
 
     @Nullable
     @Override
     public Label getLabelById(int id, @NotNull final User user) {
-        List<Label> labels = (List<Label>) getHibernateTemplate().find("from com.wisemapping.model.Label wisemapping where id=? and creator=?", new Object[]{id, user});
-        return getFirst(labels);
+        var query = currentSession().createQuery("from com.wisemapping.model.Label wisemapping where id=:id and creator=:creator");
+        query.setParameter("id", id);
+        query.setParameter("creator", user);
+        return getFirst(query.list());
     }
 
     @Nullable
     @Override
     public Label getLabelByTitle(@NotNull String title, @NotNull final User user) {
-        final List<Label> labels = (List<Label>) getHibernateTemplate().find("from com.wisemapping.model.Label wisemapping where title=? and creator=?", new Object[]{title, user});
-        return getFirst(labels);
+        var query = currentSession().createQuery("from com.wisemapping.model.Label wisemapping where title=:title and creator=:creator");
+        query.setParameter("title", title);
+        query.setParameter("creator", user);
+        return getFirst(query.list());
     }
 
     @Override
diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
index b983887a..f7e00ecb 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/MindmapManagerImpl.java
@@ -1,28 +1,30 @@
 /*
-*    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.dao;
 
 import com.wisemapping.model.*;
 import com.wisemapping.util.ZipUtils;
+import org.hibernate.Query;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+import org.springframework.orm.hibernate5.HibernateTemplate;
+import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
 import org.hibernate.criterion.Restrictions;
 import org.hibernate.criterion.SimpleExpression;
 import org.hibernate.criterion.Junction;
@@ -40,7 +42,10 @@ public class MindmapManagerImpl
     @Override
     public Collaborator findCollaborator(@NotNull final String email) {
         final Collaborator collaborator;
-        final List<Collaborator> collaborators = (List<Collaborator>) getHibernateTemplate().find("from com.wisemapping.model.Collaborator collaborator where email=?", email);
+        Query query = currentSession().createQuery("from com.wisemapping.model.Collaborator collaborator where email=:email");
+        query.setParameter("email", email);
+
+        final List<Collaborator> collaborators = query.list();
         if (collaborators != null && !collaborators.isEmpty()) {
             assert collaborators.size() == 1 : "More than one user with the same email!";
             collaborator = collaborators.get(0);
@@ -57,7 +62,7 @@ public class MindmapManagerImpl
 
     @Override
     public List<MindMapHistory> getHistoryFrom(int mindmapId) {
-        final Criteria hibernateCriteria = getSession().createCriteria(MindMapHistory.class);
+        final Criteria hibernateCriteria = currentSession().createCriteria(MindMapHistory.class);
         hibernateCriteria.add(Restrictions.eq("mindmapId", mindmapId));
         hibernateCriteria.addOrder(Order.desc("creationTime"));
 
@@ -78,7 +83,7 @@ public class MindmapManagerImpl
 
     @Override
     public void purgeHistory(int mapId) throws IOException {
-        final Criteria hibernateCriteria = getSession().createCriteria(MindMapHistory.class);
+        final Criteria hibernateCriteria = currentSession().createCriteria(MindMapHistory.class);
         hibernateCriteria.add(Restrictions.eq("mindmapId", mapId));
         hibernateCriteria.addOrder(Order.desc("creationTime"));
 
@@ -92,17 +97,18 @@ public class MindmapManagerImpl
             // If the map has not been modified in the last months, it means that I don't need to keep all the history ...
             int max = mindmap.getLastModificationTime().before(yearAgo) ? 10 : 25;
 
+            final HibernateTemplate hibernateTemplate = getHibernateTemplate();
             for (MindMapHistory history : historyList) {
                 byte[] zippedXml = history.getZippedXml();
                 if (new String(zippedXml).startsWith("<map")) {
                     history.setZippedXml(ZipUtils.bytesToZip(zippedXml));
-                    getHibernateTemplate().update(history);
+                    hibernateTemplate.update(history);
                 }
             }
 
             if (historyList.size() > max) {
                 for (int i = max; i < historyList.size(); i++) {
-                    getHibernateTemplate().delete(historyList.get(i));
+                    hibernateTemplate.delete(historyList.get(i));
                 }
             }
         }
@@ -110,7 +116,7 @@ public class MindmapManagerImpl
 
     @Override
     public List<Mindmap> search(MindMapCriteria criteria, int maxResult) {
-        final Criteria hibernateCriteria = getSession().createCriteria(Mindmap.class);
+        final Criteria hibernateCriteria = currentSession().createCriteria(Mindmap.class);
         //always search public maps
         hibernateCriteria.add(Restrictions.like("public", Boolean.TRUE));
 
@@ -154,19 +160,28 @@ public class MindmapManagerImpl
 
     @Override
     public List<Collaboration> findCollaboration(final long collaboratorId) {
-        return (List<Collaboration>) getHibernateTemplate().find("from com.wisemapping.model.Collaboration collaboration where colaborator_id=?", collaboratorId);
+        Query query = currentSession().createQuery("from com.wisemapping.model.Collaboration collaboration where colaboratorId=:colaboratorId");
+        query.setParameter("colaboratorId", collaboratorId);
+        return query.list();
     }
 
     @Override
     public List<Collaboration> findCollaboration(final CollaborationRole collaborationRole) {
-        return (List<Collaboration>) getHibernateTemplate().find("from com.wisemapping.model.Collaboration collaboration where roleId=?", collaborationRole.ordinal());
+        Query query = currentSession().createQuery("from com.wisemapping.model.Collaboration collaboration where roleId=:roleId");
+        query.setParameter("roleId", collaborationRole.ordinal());
+        return query.list();
     }
 
     @Override
     public Collaboration findCollaboration(final int mindmapId, final User user) {
         final Collaboration result;
 
-        final List<Collaboration> mindMaps = (List<Collaboration>) getHibernateTemplate().find("from com.wisemapping.model.Collaboration collaboration where mindMap.id=? and colaborator_id=?", new Object[]{mindmapId, user.getId()});
+        Query query = currentSession().createQuery("from com.wisemapping.model.Collaboration collaboration where mindMap.id=:mindMapId and colaborator_id=:collaboratorId");
+        query.setParameter("mindMap", mindmapId);
+        query.setParameter("collaboratorId", user.getId());
+
+        final List<Collaboration> mindMaps = query.list();
+
         if (mindMaps != null && !mindMaps.isEmpty()) {
             result = mindMaps.get(0);
         } else {
@@ -193,8 +208,9 @@ public class MindmapManagerImpl
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public List<Mindmap> getAllMindmaps() {
-        return (List<Mindmap>) getHibernateTemplate().find("from com.wisemapping.model.Mindmap wisemapping");
+        return currentSession().createQuery("from com.wisemapping.model.Mindmap wisemapping").list();
     }
 
     @Override
@@ -206,7 +222,12 @@ public class MindmapManagerImpl
     @Override
     public Mindmap getMindmapByTitle(final String title, final User user) {
         final Mindmap result;
-        List<Mindmap> mindMaps = (List<Mindmap>) getHibernateTemplate().find("from com.wisemapping.model.Mindmap wisemapping where title=? and creator=?", new Object[]{title, user});
+        Query query = currentSession().createQuery("from com.wisemapping.model.Mindmap wisemapping where title=:title and creator=:creator");
+        query.setParameter("title", title);
+        query.setParameter("creator", user);
+
+        List<Mindmap> mindMaps = query.list();
+
         if (mindMaps != null && !mindMaps.isEmpty()) {
             result = mindMaps.get(0);
         } else {
@@ -223,7 +244,7 @@ public class MindmapManagerImpl
     @Override
     public void saveMindmap(Mindmap mindMap) {
         assert mindMap != null : "Save Mindmap: Mindmap is required!";
-        getSession().save(mindMap);
+        currentSession().save(mindMap);
     }
 
     @Override
@@ -238,7 +259,7 @@ public class MindmapManagerImpl
     @Override
     public void removeMindmap(@NotNull final Mindmap mindMap) {
         // Delete history first ...
-        final Criteria hibernateCriteria = getSession().createCriteria(MindMapHistory.class);
+        final Criteria hibernateCriteria = currentSession().createCriteria(MindMapHistory.class);
         hibernateCriteria.add(Restrictions.eq("mindmapId", mindMap.getId()));
         List list = hibernateCriteria.list();
         getHibernateTemplate().deleteAll(list);
@@ -257,4 +278,3 @@ public class MindmapManagerImpl
         getHibernateTemplate().saveOrUpdate(history);
     }
 }
-
diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
index cb2969e3..e191eab8 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
@@ -1,20 +1,20 @@
 /*
-*    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.dao;
 
@@ -25,9 +25,8 @@ import com.wisemapping.model.AccessAuditory;
 import org.hibernate.ObjectNotFoundException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
-//import org.acegisecurity.providers.encoding.PasswordEncoder;
+import org.springframework.orm.hibernate5.support.HibernateDaoSupport;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
 import java.util.List;
 import java.util.Set;
@@ -42,29 +41,39 @@ public class UserManagerImpl
         this.passwordEncoder = passwordEncoder;
     }
 
+    @SuppressWarnings("unchecked")
     public List<User> getAllUsers() {
-        return (List<User>) getHibernateTemplate().find("from com.wisemapping.model.User user");
+        return currentSession().createQuery("from com.wisemapping.model.User user").list();
     }
 
 
     @Override
     public User getUserBy(@NotNull final String email) {
         User user = null;
-        final List<User> users = (List<User>) getHibernateTemplate().find("from com.wisemapping.model.User colaborator where email=?", email);
+
+        var query = currentSession().createQuery("from com.wisemapping.model.User colaborator where email=:email");
+        query.setParameter("email", email);
+
+        final List<User> users = query.list();
         if (users != null && !users.isEmpty()) {
             assert users.size() == 1 : "More than one user with the same email!";
             user = users.get(0);
         }
         return user;
+
     }
 
     @Override
     public Collaborator getCollaboratorBy(final String email) {
         final Collaborator cola;
-        final List cols = getHibernateTemplate().find("from com.wisemapping.model.Collaborator colaborator where email=?", email);
+        var query = currentSession().createQuery("from com.wisemapping.model.Collaborator colaborator where " +
+                "email=:email");
+        query.setParameter("email", email);
+
+        final List<User> cols = query.list();
         if (cols != null && !cols.isEmpty()) {
             assert cols.size() == 1 : "More than one colaborator with the same email!";
-            cola = (Collaborator) cols.get(0);
+            cola = cols.get(0);
         } else {
             cola = null;
         }
@@ -74,9 +83,9 @@ public class UserManagerImpl
     @Nullable
     public User getUserBy(long id) {
         User user = null;
-        try{
+        try {
             user = getHibernateTemplate().get(User.class, id);
-        } catch (ObjectNotFoundException e){
+        } catch (ObjectNotFoundException e) {
             // Ignore ...
         }
         return user;
@@ -85,13 +94,13 @@ public class UserManagerImpl
     @Override
     public void createUser(User user) {
         assert user != null : "Trying to store a null user";
-        user.setPassword(passwordEncoder.encodePassword(user.getPassword(), null));
+        user.setPassword(passwordEncoder.encode(user.getPassword()));
         getHibernateTemplate().saveOrUpdate(user);
     }
 
     @Override
     public User createUser(@NotNull User user, @NotNull Collaborator col) {
-        user.setPassword(passwordEncoder.encodePassword(user.getPassword(), null));
+        user.setPassword(passwordEncoder.encode(user.getPassword()));
         assert user != null : "Trying to store a null user";
 
         final Set<Collaboration> set = col.getCollaborations();
@@ -121,14 +130,20 @@ public class UserManagerImpl
 
     public void updateUser(@NotNull User user) {
         assert user != null : "user is null";
-        user.setPassword(passwordEncoder.encodePassword(user.getPassword(), null));
+        user.setPassword(passwordEncoder.encode(user.getPassword()));
         getHibernateTemplate().update(user);
     }
 
     public User getUserByActivationCode(long code) {
         final User user;
-        final List users = getHibernateTemplate().find("from com.wisemapping.model.User user where activationCode=?", code);
-        if (users != null && !users.isEmpty()) {
+
+        var query = currentSession().createQuery("from com.wisemapping.model.User user where " +
+                "activationCode=:activationCode");
+        query.setParameter("activationCode", code);
+        final List users = query.list();
+
+        if(users != null && !users.isEmpty()) {
+
             assert users.size() == 1 : "More than one user with the same username!";
             user = (User) users.get(0);
         } else {
diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java b/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java
index e935b577..2c3b05ed 100644
--- a/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java
+++ b/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java
@@ -1,30 +1,30 @@
 /*
-*    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.mail;
 
-import org.apache.velocity.app.VelocityEngine;
-import org.jetbrains.annotations.NotNull;
+import com.wisemapping.util.VelocityEngineUtils;
+import com.wisemapping.util.VelocityEngineWrapper;
+    import org.jetbrains.annotations.NotNull;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.mail.javamail.MimeMessagePreparator;
-import org.springframework.ui.velocity.VelocityEngineUtils;
 
 import javax.mail.internet.MimeMessage;
 import java.util.Map;
@@ -34,7 +34,7 @@ public final class Mailer {
     //~ Instance fields ......................................................................................
 
     private JavaMailSender mailSender;
-    private VelocityEngine velocityEngine;
+    private VelocityEngineWrapper velocityEngineWrapper;
     private String serverFromEmail;
     private String supportEmail;
     private String errorReporterEmail;
@@ -62,7 +62,7 @@ public final class Mailer {
                         message.setFrom(from);
                         message.setSubject(subject);
 
-                        final String messageBody = VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, "/mail/" + templateMail, model);
+                        final String messageBody = VelocityEngineUtils.mergeTemplateIntoString(velocityEngineWrapper.getVelocityEngine(), "/mail/" + templateMail, model);
                         message.setText(messageBody, true);
                     }
                 };
@@ -74,8 +74,8 @@ public final class Mailer {
         this.mailSender = mailer;
     }
 
-    public void setVelocityEngine(VelocityEngine engine) {
-        this.velocityEngine = engine;
+    public void setVelocityEngineWrapper(VelocityEngineWrapper engine) {
+        this.velocityEngineWrapper = engine;
     }
 
     public String getSupportEmail() {
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
index 710b6e64..3fd3eb85 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
@@ -1,20 +1,20 @@
 /*
-*    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.rest;
 
@@ -53,7 +53,6 @@ import com.wisemapping.service.MindmapService;
 import com.wisemapping.validator.MapInfoValidator;
 import com.wordnik.swagger.annotations.Api;
 import com.wordnik.swagger.annotations.ApiParam;
-import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -73,6 +72,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
@@ -85,7 +85,6 @@ import java.util.Set;
 @Api(value = "mindmap", description = "User Mindmap Objects.")
 @Controller
 public class MindmapController extends BaseController {
-    private final static Logger logger = Logger.getLogger("com.wisemapping");
 
     private static final String LATEST_HISTORY_REVISION = "latest";
 
@@ -257,15 +256,13 @@ public class MindmapController extends BaseController {
     }
 
     @ApiIgnore
-    @RequestMapping(method = RequestMethod.GET, value = {"/maps/{id}/document/xml", "/maps/{id}/document/xml-pub"}, consumes = {"text/plain"}, produces = {"application/xml"})
+    @RequestMapping(method = RequestMethod.GET, value = {"/maps/{id}/document/xml", "/maps/{id}/document/xml-pub"}, consumes = {"text/plain"}, produces = {"application/xml; charset=UTF-8"})
     @ResponseBody
     public byte[] retrieveDocument(@PathVariable int id, @NotNull HttpServletResponse response) throws WiseMappingException, IOException {
-        // I should not return byte, but there is some encoding issue here. Further research needed.
-        response.setCharacterEncoding("UTF-8");
         final Mindmap mindmap = findMindmapById(id);
 
         String xmlStr = mindmap.getXmlStr();
-        return xmlStr.getBytes("UTF-8");
+        return xmlStr.getBytes(StandardCharsets.UTF_8);
     }
 
     @ApiIgnore
@@ -284,11 +281,9 @@ public class MindmapController extends BaseController {
     }
 
 
-    @RequestMapping(method = RequestMethod.GET, value = {"/maps/{id}/{hid}/document/xml"}, consumes = {"text/plain"}, produces = {"application/xml"})
+    @RequestMapping(method = RequestMethod.GET, value = {"/maps/{id}/{hid}/document/xml"}, consumes = {"text/plain"}, produces = {"application/xml; charset=UTF-8"})
     @ResponseBody
     public byte[] retrieveDocument(@PathVariable int id, @PathVariable int hid, @NotNull HttpServletResponse response) throws WiseMappingException, IOException {
-        // I should not return byte, but there is some encoding issue here. Further research needed.
-        response.setCharacterEncoding("UTF-8");
         final MindMapHistory mindmapHistory = mindmapService.findMindmapHistory(id, hid);
         return mindmapHistory.getUnzipXml();
     }
@@ -304,20 +299,16 @@ public class MindmapController extends BaseController {
 
         final LockInfo lockInfo = lockManager.getLockInfo(mindmap);
         if (lockInfo.getUser().identityEquality(user)) {
-            long savedTimestamp = mindmap.getLastModificationTime().getTimeInMillis();
-            final boolean outdated = savedTimestamp > timestamp;
-
+            final boolean outdated = mindmap.getLastModificationTime().getTimeInMillis() > timestamp;
             if (lockInfo.getSession() == session) {
                 // Timestamp might not be returned to the client. This try to cover this case, ignoring the client timestamp check.
                 final User lastEditor = mindmap.getLastEditor();
                 boolean editedBySameUser = lastEditor == null || user.identityEquality(lastEditor);
                 if (outdated && !editedBySameUser) {
-                    throw new SessionExpiredException("Map has been updated by " + (lastEditor.getEmail()) + ",Timestamp:" + timestamp + "," + savedTimestamp + ", User:" + lastEditor.getId() + ":" + user.getId() + ",Mail:'" + lastEditor.getEmail() + "':'" + user.getEmail(), lastEditor);
+                    throw new SessionExpiredException("Map has been updated by " + (lastEditor.getEmail()) + ",Timestamp:" + timestamp + "," + mindmap.getLastModificationTime().getTimeInMillis() + ", User:" + lastEditor.getId() + ":" + user.getId() + ",Mail:'" + lastEditor.getEmail() + "':'" + user.getEmail(), lastEditor);
                 }
             } else if (outdated) {
-                logger.warn("Sessions:" + session + ":" + lockInfo.getSession() + ",Timestamp: " + timestamp + ": " + savedTimestamp);
-                // @Todo: Temporally disabled to unblock save action. More research needed.
-//                throw new MultipleSessionsOpenException("Sessions:" + session + ":" + lockInfo.getSession() + ",Timestamp: " + timestamp + ": " + savedTimestamp);
+                throw new MultipleSessionsOpenException("Sessions:" + session + ":" + lockInfo.getSession() + ",Timestamp: " + timestamp + ": " + lockInfo.getTimestamp() + ",User:");
             }
         } else {
             throw new SessionExpiredException("Different Users.", lockInfo.getUser());
@@ -395,7 +386,7 @@ public class MindmapController extends BaseController {
         // Update map ...
         final Mindmap mindmap = findMindmapById(id);
         mindmap.setTitle(title);
-        mindmapService.updateMindmap(mindMap, !true);
+        mindmapService.updateMindmap(mindMap, false);
     }
 
     @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/collabs", consumes = {"application/json", "application/xml"}, produces = {"application/json", "application/xml"})
@@ -464,7 +455,7 @@ public class MindmapController extends BaseController {
         // Update map ...
         final Mindmap mindmap = findMindmapById(id);
         mindmap.setDescription(description);
-        mindmapService.updateMindmap(mindMap, !true);
+        mindmapService.updateMindmap(mindMap, false);
     }
 
     @RequestMapping(method = RequestMethod.PUT, value = "/maps/{id}/publish", consumes = {"text/plain"}, produces = {"application/json", "application/xml"})
@@ -480,7 +471,7 @@ public class MindmapController extends BaseController {
 
         // Update map status ...
         mindMap.setPublic(Boolean.parseBoolean(value));
-        mindmapService.updateMindmap(mindMap, !true);
+        mindmapService.updateMindmap(mindMap, false);
 
     }
 
@@ -530,7 +521,7 @@ public class MindmapController extends BaseController {
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     public void batchDelete(@RequestParam(required = true) String ids) throws IOException, WiseMappingException {
         final User user = Utils.getUser();
-        final String[] mapsIds = ids.split(",");
+        final String[] mapsIds = ",".split(ids);
         for (final String mapId : mapsIds) {
             final Mindmap mindmap = findMindmapById(Integer.parseInt(mapId));
             mindmapService.removeMindmap(mindmap, user);
@@ -651,11 +642,12 @@ public class MindmapController extends BaseController {
         final User user = Utils.getUser();
         final Label delegated = restLabel.getDelegated();
         delegated.setCreator(user);
+
         final Label found = labelService.getLabelById(labelId, user);
         if (found == null) {
             throw new LabelCouldNotFoundException("Label could not be found. Id: " + labelId);
         }
-        for (String id : ids.split(",")) {
+        for (String id : ",".split(ids)) {
             final int mindmapId = Integer.parseInt(id);
             final Mindmap mindmap = findMindmapById(mindmapId);
             final Label label = mindmap.findLabel(labelId);
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java b/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java
index 69ff3b3f..ccb5e3b5 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/view/TransformView.java
@@ -1,20 +1,20 @@
 /*
-*    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.rest.view;
 
@@ -55,7 +55,7 @@ public class TransformView extends AbstractView {
     }
 
     @Override
-    protected void renderMergedOutputModel(@NotNull Map<String, Object> viewMap, @NotNull HttpServletRequest request, @NotNull final HttpServletResponse response) throws Exception {
+    protected void renderMergedOutputModel(@NotNull Map<String, Object> viewMap, @NotNull HttpServletRequest request, @NotNull final HttpServletResponse response) {
 
         final String content = (String) viewMap.get("content");
         final String filename = (String) viewMap.get("filename");
@@ -80,21 +80,22 @@ public class TransformView extends AbstractView {
         this.setContentDisposition(request, response, fileName);
 
         // Change image link URL.
-        final ServletContext servletContext = request.getSession().getServletContext();
+        final ServletContext servletContext = getServletContext();
         final ExporterFactory factory = new ExporterFactory(servletContext);
         try {
             // Write the conversion content ...
             final ServletOutputStream outputStream = response.getOutputStream();
             if (exportFormat == ExportFormat.FREEMIND) {
-                response.setCharacterEncoding("ASCII");
+                response.setContentType(String.format("%s; charset=%s", contentType, "ASCII"));
                 factory.export(properties, content, outputStream, null);
             } else if (exportFormat == ExportFormat.WISEMAPPING) {
-                response.setCharacterEncoding(DEFAULT_ENCODING);
+                response.setContentType(String.format("%s; charset=%s", contentType, DEFAULT_ENCODING));
                 final Object mindmap = viewMap.get("mindmap");
                 final StreamResult result = new StreamResult(outputStream);
                 jaxbMarshaller.marshal(mindmap, result);
             } else if (exportFormat == ExportFormat.MICROSOFT_EXCEL || exportFormat == ExportFormat.TEXT || exportFormat == ExportFormat.OPEN_OFFICE_WRITER || exportFormat == ExportFormat.MINDJET) {
-                response.setCharacterEncoding(DEFAULT_ENCODING);
+
+                response.setContentType(String.format("%s; charset=%s", contentType, DEFAULT_ENCODING));
                 factory.export(properties, content, outputStream, null);
             } else {
                 // Image export ...
@@ -112,9 +113,9 @@ public class TransformView extends AbstractView {
         String disposition = fileName;
         try {
             byte[] fileNameBytes = fileName.getBytes((isInternetExplorer) ? ("windows-1250") : ("utf-8"));
-            String dispositionFileName = "";
+            final StringBuilder dispositionFileName = new StringBuilder();
             for (byte b : fileNameBytes) {
-                dispositionFileName += (char) (b & 0xff);
+                dispositionFileName.append((char) (b & 0xff));
             }
             disposition = "attachment; filename=\"" + dispositionFileName + "\"";
         } catch (UnsupportedEncodingException ence) {
diff --git a/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationProvider.java b/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationProvider.java
index b4626b3f..078fffea 100644
--- a/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationProvider.java
+++ b/wise-webapp/src/main/java/com/wisemapping/security/AuthenticationProvider.java
@@ -1,20 +1,20 @@
 /*
-*    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.security;
 
@@ -23,9 +23,9 @@ import com.wisemapping.model.User;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
 
 public class AuthenticationProvider implements org.springframework.security.authentication.AuthenticationProvider {
@@ -41,7 +41,8 @@ public class AuthenticationProvider implements org.springframework.security.auth
         final UserDetails userDetails = getUserDetailsService().loadUserByUsername(email);
         final User user = userDetails.getUser();
         final String credentials = (String) auth.getCredentials();
-        if (user == null || credentials == null || !encoder.isPasswordValid(user.getPassword(), credentials, null)) {
+
+        if (user == null || credentials == null || !encoder.matches(user.getPassword(), credentials)) {
             throw new BadCredentialsException("Username/Password does not match for " + auth.getPrincipal());
         }
         userDetailsService.getUserService().auditLogin(user);
@@ -49,7 +50,7 @@ public class AuthenticationProvider implements org.springframework.security.auth
     }
 
     @Override
-    public boolean supports(final Class<? extends Object> authentication) {
+    public boolean supports(final Class<?> authentication) {
         return (UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication));
     }
 
diff --git a/wise-webapp/src/main/java/com/wisemapping/security/CustomPasswordEncoder.java b/wise-webapp/src/main/java/com/wisemapping/security/CustomPasswordEncoder.java
index e5582b27..5bf97ccd 100755
--- a/wise-webapp/src/main/java/com/wisemapping/security/CustomPasswordEncoder.java
+++ b/wise-webapp/src/main/java/com/wisemapping/security/CustomPasswordEncoder.java
@@ -1,54 +1,44 @@
 /*
-*    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.security;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.springframework.dao.DataAccessException;
-import org.springframework.security.authentication.encoding.PasswordEncoder;
-import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
-
-public class CustomPasswordEncoder
-        implements PasswordEncoder {
-    private PasswordEncoder delegateEncoder = new ShaPasswordEncoder();
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
+public class CustomPasswordEncoder implements PasswordEncoder {
     private static final String ENC_PREFIX = "ENC:";
+    private BCryptPasswordEncoder delegateEncoder = new BCryptPasswordEncoder(16);
 
-    public String encodePassword(@NotNull String rawPass, @Nullable Object salt) throws DataAccessException {
-
-        String password = rawPass;
-        if (!rawPass.startsWith(ENC_PREFIX)) {
-            password = ENC_PREFIX + delegateEncoder.encodePassword(rawPass, salt);
+    @Override
+    public String encode(CharSequence rawPassword) {
+        String password = rawPassword.toString();
+        if(!rawPassword.toString().startsWith(ENC_PREFIX)) {
+            password = ENC_PREFIX + delegateEncoder.encode(rawPassword);
         }
 
         return password;
     }
 
-    public boolean isPasswordValid(@NotNull String encPass, @NotNull String rawPass, Object salt) throws DataAccessException {
+    @Override
+    public boolean matches(CharSequence rawPassword, String encodedPassword) {
+        String encodedRawPassword = delegateEncoder.encode(rawPassword);
 
-        String pass1 = "" + encPass;
-        String pass2 = rawPass;
-
-        if (pass1.startsWith(ENC_PREFIX)) {
-
-            pass2 = encodePassword(rawPass, salt);
-        }
-        return pass1.equals(pass2);
+        return delegateEncoder.matches(encodedRawPassword, encodedPassword);
     }
 }
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
index 5b99e987..41641136 100755
--- a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
@@ -1,43 +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.service;
 
 import com.wisemapping.dao.UserManager;
 import com.wisemapping.exceptions.WiseMappingException;
 import com.wisemapping.mail.NotificationService;
-import com.wisemapping.model.AccessAuditory;
-import com.wisemapping.model.AuthenticationType;
-import com.wisemapping.model.Collaborator;
-import com.wisemapping.model.Mindmap;
-import com.wisemapping.model.User;
-import org.apache.velocity.app.VelocityEngine;
+import com.wisemapping.model.*;
+import com.wisemapping.util.VelocityEngineUtils;
+import com.wisemapping.util.VelocityEngineWrapper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.ui.velocity.VelocityEngineUtils;
 
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 public class UserServiceImpl
         implements UserService {
@@ -45,7 +37,7 @@ public class UserServiceImpl
     private MindmapService mindmapService;
     private NotificationService notificationService;
     private MessageSource messageSource;
-    private VelocityEngine velocityEngine;
+    private VelocityEngineWrapper velocityEngineWrapper;
 
 
     @Override
@@ -102,7 +94,7 @@ public class UserServiceImpl
     }
 
     @Override
-    public void removeUser(@NotNull  User user) {
+    public void removeUser(@NotNull User user) {
         // Force object reload before removing....
         final User userBy = userManager.getUserBy(user.getEmail());
         userManager.removeUser(userBy);
@@ -165,7 +157,9 @@ public class UserServiceImpl
         model.put("noArgs", new Object[]{});
         model.put("locale", locale);
 
-        final String mapXml = VelocityEngineUtils.mergeTemplateIntoString(velocityEngine, "/samples/tutorial.vm", model);
+        final String mapXml = VelocityEngineUtils
+                .mergeTemplateIntoString(velocityEngineWrapper
+                        .getVelocityEngine(), "/samples/tutorial.vm", model);
 
         result.setXmlStr(mapXml);
         result.setTitle(messageSource.getMessage("WELCOME", null, locale) + " " + firstName);
@@ -212,8 +206,8 @@ public class UserServiceImpl
         this.messageSource = messageSource;
     }
 
-    public void setVelocityEngine(VelocityEngine velocityEngine) {
-        this.velocityEngine = velocityEngine;
+    public void setVelocityEngineWrapper(VelocityEngineWrapper velocityEngineWrapper) {
+        this.velocityEngineWrapper = velocityEngineWrapper;
     }
 
     @Override
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineUtils.java b/wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineUtils.java
new file mode 100644
index 00000000..ca5e82a1
--- /dev/null
+++ b/wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineUtils.java
@@ -0,0 +1,38 @@
+package com.wisemapping.util;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.exception.VelocityException;
+
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Map;
+
+public class VelocityEngineUtils {
+    private static final Log logger = LogFactory.getLog(VelocityEngineUtils.class);
+
+    public static void mergeTemplate(
+            VelocityEngine velocityEngine, String templateLocation,
+            Map<String, Object> model, Writer writer
+    ) throws VelocityException {
+        try {
+            VelocityContext velocityContext = new VelocityContext(model);
+            velocityEngine.mergeTemplate(templateLocation, "UTF-8", velocityContext, writer);
+        } catch (RuntimeException ex) {
+            throw ex;
+        } catch (Exception ex) {
+            logger.error("Why does VelocityEngine throw a generic checked exception, after all?", ex);
+            throw new VelocityException(ex.toString());
+        }
+    }
+
+    public static String mergeTemplateIntoString(
+            VelocityEngine velocityEngine, String templateLocation, Map<String, Object> model
+    ) throws VelocityException {
+        StringWriter result = new StringWriter();
+        mergeTemplate(velocityEngine, templateLocation, model, result);
+        return result.toString();
+    }
+}
diff --git a/wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineWrapper.java b/wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineWrapper.java
new file mode 100644
index 00000000..d36706a6
--- /dev/null
+++ b/wise-webapp/src/main/java/com/wisemapping/util/VelocityEngineWrapper.java
@@ -0,0 +1,24 @@
+package com.wisemapping.util;
+
+import org.apache.commons.collections.ExtendedProperties;
+import org.apache.velocity.app.VelocityEngine;
+import org.jetbrains.annotations.NotNull;
+
+public class VelocityEngineWrapper {
+    private VelocityEngine velocityEngine;
+
+    public VelocityEngineWrapper() {
+        ExtendedProperties extendedProperties = new ExtendedProperties();
+        extendedProperties.setProperty("resource.loader", "class");
+        extendedProperties.setProperty("class.resource.loader.class",
+                "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+
+        this.velocityEngine = new VelocityEngine();
+        velocityEngine.setExtendedProperties(extendedProperties);
+    }
+
+    @NotNull
+    public VelocityEngine getVelocityEngine() {
+        return velocityEngine;
+    }
+}
diff --git a/wise-webapp/src/main/webapp/WEB-INF/web.xml b/wise-webapp/src/main/webapp/WEB-INF/web.xml
index 50979cbf..8eb7a18d 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/web.xml
@@ -53,7 +53,7 @@
 
     <filter>
         <filter-name>hibernate</filter-name>
-        <filter-class>org.springframework.orm.hibernate3.support.OpenSessionInViewFilter</filter-class>
+        <filter-class>org.springframework.orm.hibernate5.support.OpenSessionInViewFilter</filter-class>
         <init-param>
             <param-name>singleSession</param-name>
             <param-value>true</param-value>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml
index 7beb0094..fe4d933c 100755
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-aop.xml
@@ -2,13 +2,11 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-		http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+		http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean id="viewSecurityAdvisor"
           class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
-        <property name="advice">
-            <ref local="viewSecurityAdvice"/>
-        </property>
+        <property name="advice" ref="viewSecurityAdvice"/>
         <property name="mappedNames">
             <list>
                 <value>getMindmapUserBy</value>
@@ -22,9 +20,7 @@
 
     <bean id="updateSecurityAdvisor"
           class="org.springframework.aop.support.NameMatchMethodPointcutAdvisor">
-        <property name="advice">
-            <ref local="updateSecurityAdvice"/>
-        </property>
+        <property name="advice" ref="updateSecurityAdvice"/>
         <property name="mappedNames">
             <list>
                 <value>save*</value>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
index 564a9cdc..93d30e85 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-		http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+		http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean id="wiseDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
         <property name="driverClassName" value="${database.driver}"/>
@@ -13,14 +13,14 @@
         <property name="validationQuery" value="${database.validation.query}"/>
     </bean>
 
-     <!--Disconnect this lines for production environments -->
+    <!--Descoment this lines for production environments -->
     <!--<bean id="wiseDataSource" class="org.springframework.jndi.JndiObjectFactoryBean">-->
-        <!--<property name="jndiName">-->
-            <!--<value>java:comp/env/jdbc/wisemapping</value>-->
-        <!--</property>-->
+    <!--<property name="jndiName">-->
+    <!--<value>java:comp/env/jdbc/wisemapping</value>-->
+    <!--</property>-->
     <!--</bean>-->
 
-    <bean id="mindmapSessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+    <bean id="mindmapSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
         <property name="dataSource" ref="wiseDataSource"/>
         <property name="mappingResources">
             <list>
@@ -40,21 +40,13 @@
         </property>
     </bean>
 
-    <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-        <property name="sessionFactory">
-            <ref local="mindmapSessionFactory"/>
-        </property>
-    </bean>
-
-    <!-- Spring Data Access Exception Translator Defintion -->
-    <bean id="jdbcExceptionTranslator" class="org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator">
-        <property name="dataSource" ref="wiseDataSource"/>
+    <bean id="transactionManager" class="org.springframework.orm.hibernate5.HibernateTransactionManager">
+        <property name="sessionFactory" ref="mindmapSessionFactory"/>
     </bean>
 
     <!-- Hibernate Template Definition -->
-    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate3.HibernateTemplate">
+    <bean id="hibernateTemplate" class="org.springframework.orm.hibernate5.HibernateTemplate">
         <property name="sessionFactory" ref="mindmapSessionFactory"/>
-        <property name="jdbcExceptionTranslator" ref="jdbcExceptionTranslator"/>
     </bean>
 
     <bean id="txAttributes"
@@ -66,8 +58,7 @@
         </property>
     </bean>
 
-    <bean id="txInterceptor"
-          class="org.springframework.transaction.interceptor.TransactionInterceptor">
+    <bean id="txInterceptor" class="org.springframework.transaction.interceptor.TransactionInterceptor">
         <property name="transactionManager" ref="transactionManager"/>
         <property name="transactionAttributeSource" ref="txAttributes"/>
     </bean>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml
index 7993d624..eda5c590 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-rest.xml
@@ -6,11 +6,11 @@
        xmlns:mvc="http://www.springframework.org/schema/mvc"
        xsi:schemaLocation="
 		http://www.springframework.org/schema/beans
-		http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+		http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context
-		http://www.springframework.org/schema/context/spring-context-4.2.xsd
+		http://www.springframework.org/schema/context/spring-context.xsd
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd">
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <context:component-scan base-package="com.wisemapping.rest"/>
     <context:annotation-config/>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml
index 0b3271fc..5d3824f3 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-db.xml
@@ -4,9 +4,9 @@
        xmlns:sec="http://www.springframework.org/schema/security"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-          http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+          http://www.springframework.org/schema/beans/spring-beans.xsd
           http://www.springframework.org/schema/security
-          http://www.springframework.org/schema/security/spring-security-4.2.xsd">
+          http://www.springframework.org/schema/security/spring-security.xsd">
 
     <sec:authentication-manager alias="authenticationManager">
         <sec:authentication-provider ref="dbAuthenticationProvider"/>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml
index eea5e17d..297e8432 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security-ldap.xml
@@ -3,9 +3,9 @@
        xmlns:sec="http://www.springframework.org/schema/security"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-          http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+          http://www.springframework.org/schema/beans/spring-beans.xsd
           http://www.springframework.org/schema/security
-          http://www.springframework.org/schema/security/spring-security-4.2.xsd">
+          http://www.springframework.org/schema/security/spring-security.xsd">
 
 
     <sec:authentication-manager>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
index e9c36751..b78d6a27 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
@@ -4,9 +4,9 @@
        xmlns:sec="http://www.springframework.org/schema/security"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-          http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+          http://www.springframework.org/schema/beans/spring-beans.xsd
           http://www.springframework.org/schema/security
-          http://www.springframework.org/schema/security/spring-security-4.2.xsd">
+          http://www.springframework.org/schema/security/spring-security.xsd">
 
     <sec:http pattern="/css/**" security="none"/>
     <sec:http pattern="/js/**" security="none"/>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
index 8640a3a9..97a97a3b 100755
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
@@ -3,19 +3,19 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-		http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+		http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context
-		http://www.springframework.org/schema/context/spring-context-4.2.xsd">
+		http://www.springframework.org/schema/context/spring-context.xsd">
 
     <context:property-placeholder location="/WEB-INF/app.properties" ignore-unresolvable="true"/>
 
-    <bean id="mailer" class="com.wisemapping.mail.Mailer" scope ="singleton">
+    <bean id="mailer" class="com.wisemapping.mail.Mailer">
         <constructor-arg index="0" value="${mail.serverSendEmail}"/>
         <constructor-arg index="1" value="${mail.supportEmail}"/>
         <constructor-arg index="2" value="${mail.errorReporterEmail}"/>
 
         <property name="mailSender" ref="mailSender"/>
-        <property name="velocityEngine" ref="velocityEngine"/>
+        <property name="velocityEngineWrapper" ref="velocityEngineWrapper"/>
     </bean>
 
     <bean id="userServiceTarget" class="com.wisemapping.service.UserServiceImpl">
@@ -23,14 +23,12 @@
         <property name="mindmapService" ref="mindMapServiceTarget"/>
         <property name="notificationService" ref="notificationService"/>
         <property name="messageSource" ref="messageSource"/>
-        <property name="velocityEngine" ref="velocityEngine"/>
+        <property name="velocityEngineWrapper" ref="velocityEngineWrapper"/>
     </bean>
 
     <bean id="userService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
         <property name="transactionManager" ref="transactionManager"/>
-        <property name="target">
-            <ref local="userServiceTarget"/>
-        </property>
+        <property name="target" ref="userServiceTarget" />
         <property name="transactionAttributes">
             <props>
                 <prop key="*">PROPAGATION_REQUIRED</prop>
@@ -68,9 +66,7 @@
 
     <bean id="labelService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
         <property name="transactionManager" ref="transactionManager"/>
-        <property name="target">
-            <ref local="labelServiceTarget"/>
-        </property>
+        <property name="target" ref="labelServiceTarget" />
         <property name="transactionAttributes">
             <props>
                 <prop key="*">PROPAGATION_REQUIRED</prop>
@@ -93,16 +89,10 @@
         </property>
     </bean>
 
-    <bean id="velocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
-        <property name="velocityProperties">
-            <value>
-                resource.loader=class
-                class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
-            </value>
-        </property>
+    <bean id="velocityEngineWrapper" class="com.wisemapping.util.VelocityEngineWrapper">
     </bean>
 
-    <bean id="notificationService" class="com.wisemapping.mail.NotificationService"  scope ="singleton">
+    <bean id="notificationService" class="com.wisemapping.mail.NotificationService">
         <property name="baseUrl" value="${site.baseurl}"/>
         <property name="mailer" ref="mailer"/>
     </bean>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
index 948d6432..7fab100c 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
@@ -5,11 +5,11 @@
        xmlns:mvc="http://www.springframework.org/schema/mvc"
        xsi:schemaLocation="
 		http://www.springframework.org/schema/beans
-		http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+		http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/context
-		http://www.springframework.org/schema/context/spring-context-4.2.xsd
+		http://www.springframework.org/schema/context/spring-context.xsd
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd">
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <context:component-scan base-package="com.wisemapping.webmvc"/>
     <context:annotation-config/>
@@ -71,7 +71,7 @@
     </bean>
 
     <bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
-        <property name="viewClass" value="org.springframework.web.servlet.view.tiles2.TilesView"/>
+        <property name="viewClass" value="org.springframework.web.servlet.view.tiles3.TilesView"/>
     </bean>
 
     <bean id="tilesConfigurer" class="org.springframework.web.servlet.view.tiles2.TilesConfigurer">