diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml index fba5bf53..fd873ba1 100644 --- a/wise-webapp/pom.xml +++ b/wise-webapp/pom.xml @@ -119,16 +119,6 @@ ${org.springframework.version} compile - - javax.xml.bind - jaxb-api - 2.0 - - - javax.xml.bind - jsr173_api - 1.0 - org.apache.xmlgraphics fop @@ -188,12 +178,6 @@ ${org.springframework.version} runtime - - javax.transaction - jta - 1.0.1B - runtime - org.springframework spring-jdbc @@ -236,21 +220,15 @@ 1.7 - javax.servlet - servlet-api - 2.4 + javax + javaee-api + 6.0 provided - - javax.servlet - jstl - 1.2 - javax.mail mail 1.4 - compile mysql @@ -323,8 +301,49 @@ swagger-springmvc 0.6.6 + + com.wordnik + swagger-annotations_2.9.1 + 1.2.0 + + + + coverage + + + + org.jacoco + jacoco-maven-plugin + 0.6.4.201312101107 + + + + pre-unit-test + + prepare-agent + + + + + post-unit-test + test + + report + + + + + + + hsqldb @@ -511,34 +530,7 @@ org.apache.maven.plugins maven-surefire-plugin - - org.jacoco - jacoco-maven-plugin - 0.6.4.201312101107 - - - - pre-unit-test - - prepare-agent - - - - - post-unit-test - test - - report - - - - + org.apache.tomcat.maven tomcat7-maven-plugin @@ -557,7 +549,7 @@ org.eclipse.jetty jetty-maven-plugin - 9.1.0.v20131115 + 9.1.1.v20140108 foo 9999 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 ea58bc52..749fd5d1 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 f5dd91da..847f74f8 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 @@

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

@@ -62,4 +78,4 @@
-<%@ include file="/jsp/googleAnalytics.jsf" %> +<%@ include file="/jsp/googleAnalytics.jsf" %> \ No newline at end of file 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()); %>