From 9e3806f73a3d21c90b4dd557842606971d8056dc Mon Sep 17 00:00:00 2001 From: Paulo Gustavo Veiga Date: Sun, 26 Jan 2014 19:28:54 -0300 Subject: [PATCH] Add Jira Issue Integration. Conflicts: wise-webapp/pom.xml --- wise-webapp/pom.xml | 172 ++++++++++++------ .../wisemapping/service/LockManagerImpl.java | 2 - .../wisemapping/webmvc/MindmapController.java | 6 +- .../src/main/resources/messages_en.properties | 3 +- .../src/main/resources/messages_es.properties | 4 +- wise-webapp/src/main/webapp/jsp/footer.jsp | 48 +++-- wise-webapp/src/main/webapp/jsp/init.jsp | 2 +- 7 files changed, 154 insertions(+), 83 deletions(-) diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index 04bdd97c..c6bf5cdf 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -284,19 +284,14 @@ runtime - com.mangofactory - swagger-springmvc - 0.6.6 - - - org.projectlombok - lombok - 1.12.4 + org.codehaus.jackson + jackson-core-asl + 1.9.4 org.codehaus.jackson jackson-mapper-asl - 1.9.13 + 1.9.4 compile @@ -323,55 +318,115 @@ jsoup 1.7.1 + + com.mangofactory + swagger-springmvc + 0.6.6 + + + + hsqldb + + true + + + + + org.codehaus.mojo + sql-maven-plugin + 1.5 + + + org.hsqldb.jdbc.JDBCDriver + jdbc:hsqldb:file:${project.build.directory}/db/wisemapping + sa + + + + + mysql + mysql-connector-java + 5.1.5 + + + org.hsqldb + hsqldb + 2.2.8 + + + + + + drop-schemas + prepare-package + + execute + + + continue + descending + + ${project.basedir} + + config/database/hsql/drop-schemas.sql + config/database/hsql/create-schemas.sql + config/database/hsql/apopulate-schemas.sql + + + + + + + + + + + mysqldb + + false + + + + + org.codehaus.mojo + sql-maven-plugin + 1.5 + + + mysql + mysql-connector-java + 5.1.5 + + + + + init-schema + + execute + + prepare-package + + + + com.mysql.jdbc.Driver + root + + jdbc:mysql://127.0.0.1:3306/?useUnicode=true&characterEncoding=UTF-8 + false + + config/database/mysql/create-database.sql + config/database/mysql/create-schemas.sql + config/database/mysql/apopulate-schemas.sql + + + + + + + - - org.codehaus.mojo - sql-maven-plugin - 1.5 - - - org.hsqldb.jdbc.JDBCDriver - jdbc:hsqldb:file:${project.build.directory}/db/wisemapping - sa - - - - - mysql - mysql-connector-java - 5.1.5 - - - org.hsqldb - hsqldb - 2.2.8 - - - - - - drop-schemas - prepare-package - - execute - - - continue - descending - - ${project.basedir} - - config/database/hsql/drop-schemas.sql - config/database/hsql/create-schemas.sql - config/database/hsql/apopulate-schemas.sql - - - - - - org.codehaus.mojo native2ascii-maven-plugin @@ -452,16 +507,14 @@ - org.apache.maven.plugins maven-surefire-plugin - - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - 8.1.14.v20131031 + 9.1.1.v20140108 foo 9999 @@ -484,7 +537,6 @@ ${project.build.directory} - diff --git a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java index 68d80fd2..3d1d3fca 100644 --- a/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java +++ b/wise-webapp/src/main/java/com/wisemapping/service/LockManagerImpl.java @@ -104,8 +104,6 @@ class LockManagerImpl implements LockManager { } private void unlock(int mapId) { - System.out.println("Unlocking:"+mapId); - logger.debug("Unlock map id:" + mapId); lockInfoByMapId.remove(mapId); } diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java index f413dffe..94264b8a 100644 --- a/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java +++ b/wise-webapp/src/main/java/com/wisemapping/webmvc/MindmapController.java @@ -151,19 +151,18 @@ public class MindmapController { final Locale locale = LocaleContextHolder.getLocale(); // Is the mindmap locked ?. + boolean isLocked = false; boolean readOnlyMode = !requiresLock || !mindmap.hasPermissions(collaborator, CollaborationRole.EDITOR); if (!readOnlyMode) { final LockManager lockManager = this.mindmapService.getLockManager(); if (lockManager.isLocked(mindmap) && !lockManager.isLockedBy(mindmap, collaborator)) { readOnlyMode = true; - model.addAttribute("mindmapLocked", true); } else { model.addAttribute("lockTimestamp", mindmap.getLastModificationTime().getTimeInMillis()); model.addAttribute(LOCK_SESSION_ATTRIBUTE, lockManager.generateSession()); } model.addAttribute("lockInfo", lockManager.getLockInfo(mindmap)); } - // Set render attributes ... model.addAttribute("mindmap", mindmapBean); @@ -171,6 +170,9 @@ public class MindmapController { model.addAttribute("locale", locale.toString().toLowerCase()); model.addAttribute("principal", collaborator); model.addAttribute("readOnlyMode", readOnlyMode); + model.addAttribute("memoryPersistence", false); + model.addAttribute("mindmapLocked", isLocked); + return "mindmapEditor"; } diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties index 3a21e3c7..000a8e2b 100644 --- a/wise-webapp/src/main/resources/messages_en.properties +++ b/wise-webapp/src/main/resources/messages_en.properties @@ -236,7 +236,8 @@ TUTORIAL.FONT_STYLE=Styles TUTORIAL.FONT_TYPE=Type TUTORIAL.SAMPLE_NOTE=This is a simple note !. SUPPORT=Support -FEEDBACK=Feedback +FEEDBACK=Got Feedback ? +REPORT_BUG=Raise An Issue CONTACT_US=Contact Us #Pending for translation ... diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-webapp/src/main/resources/messages_es.properties index 8a1f5c49..9ac487bb 100644 --- a/wise-webapp/src/main/resources/messages_es.properties +++ b/wise-webapp/src/main/resources/messages_es.properties @@ -235,7 +235,9 @@ TUTORIAL.FONT_STYLE=Estilos TUTORIAL.FONT_TYPE=Tipos de Fuente TUTORIAL.SAMPLE_NOTE=Esto es una Nota ! SUPPORT=Ayuda -FEEDBACK=Feedback +FEEDBACK=Tenes Feedback ? +REPORT_BUG=Reportar Problema + CONTACT_US=Contáctenos diff --git a/wise-webapp/src/main/webapp/jsp/footer.jsp b/wise-webapp/src/main/webapp/jsp/footer.jsp index ffcf0d74..da437861 100644 --- a/wise-webapp/src/main/webapp/jsp/footer.jsp +++ b/wise-webapp/src/main/webapp/jsp/footer.jsp @@ -1,19 +1,35 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +
+ + -
-
- - + } + }); + + +
+ +
@@ -35,10 +51,10 @@

- | - | - | -
+ | + | + | +

diff --git a/wise-webapp/src/main/webapp/jsp/init.jsp b/wise-webapp/src/main/webapp/jsp/init.jsp index 376f6a22..4ab7e2a8 100644 --- a/wise-webapp/src/main/webapp/jsp/init.jsp +++ b/wise-webapp/src/main/webapp/jsp/init.jsp @@ -1,7 +1,7 @@ +<%@taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%> <%@taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <% request.setAttribute("principal", com.wisemapping.security.Utils.getUser()); %>