Add Jira Issue Integration.

wise-webapp/pom.xml

@@ -119,16 +119,6 @@
             <version>${org.springframework.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jsr173_api</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.xmlgraphics</groupId>
             <artifactId>fop</artifactId>
@@ -188,12 +178,6 @@
             <version>${org.springframework.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.transaction</groupId>
-            <artifactId>jta</artifactId>
-            <version>1.0.1B</version>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
@@ -236,21 +220,15 @@
             <version>1.7</version>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>javax</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javaee-api</artifactId>
-            <version>2.4</version>
+            <version>6.0</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-        </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
             <version>1.4</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -323,8 +301,49 @@
             <artifactId>swagger-springmvc</artifactId>
             <version>0.6.6</version>
         </dependency>
+        <dependency>
+            <groupId>com.wordnik</groupId>
+            <artifactId>swagger-annotations_2.9.1</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+
     </dependencies>
     <profiles>
+        <profile>
+            <id>coverage</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <version>0.6.4.201312101107</version>
+                        <executions>
+                            <!--
+                            Prepares the property pointing to the JaCoCo runtime agent which
+                            is passed as VM argument when Maven the Surefire plugin is executed.
+                            -->
+                            <execution>
+                                <id>pre-unit-test</id>
+                                <goals>
+                                    <goal>prepare-agent</goal>
+                                </goals>
+                            </execution>
+                            <!--
+                            Ensures that the code coverage report for unit tests is created after
+                            unit tests have been run.
+                            -->
+                            <execution>
+                                <id>post-unit-test</id>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>report</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>hsqldb</id>
             <activation>
@@ -511,34 +530,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
-            <plugin>
+
-                <groupId>org.jacoco</groupId>
-                <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.6.4.201312101107</version>
-                <executions>
-                    <!--
-                       Prepares the property pointing to the JaCoCo runtime agent which
-                       is passed as VM argument when Maven the Surefire plugin is executed.
-                   -->
-                    <execution>
-                        <id>pre-unit-test</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <!--
-                       Ensures that the code coverage report for unit tests is created after
-                       unit tests have been run.
-                   -->
-                    <execution>
-                        <id>post-unit-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.tomcat.maven</groupId>
                 <artifactId>tomcat7-maven-plugin</artifactId>
@@ -557,7 +549,7 @@
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
-                <version>9.1.0.v20131115</version>
+                <version>9.1.1.v20140108</version>
                 <configuration>
                     <stopKey>foo</stopKey>
                     <stopPort>9999</stopPort>

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);
     }

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";
     }
 

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 ...

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
 
 

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" %>
+<div id="footerContainer">
+    <script type="text/javascript" src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=a47981d6"></script>
+    <script type="text/javascript" src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=703b9822"></script>
 
-<div id="footerContainer" class="row">
+    <script type="text/javascript">
-    <div class="span1 offset3">
+     window.ATL_JQ_PAGE_PROPS = $.extend(window.ATL_JQ_PAGE_PROPS, {
-        <a href="https://twitter.com/share" class="twitter-share-button" data-via="wisemapping"
+        "a47981d6": {
-           data-related="wisemapping">Tweet</a>
+            triggerFunction:  function(showCollectorDialog) {
-        <script>!function (d, s, id) {
+                //Requries that jQuery is available!
-            var js, fjs = d.getElementsByTagName(s)[0];
+                jQuery("#feedbackBtn").click(function(e) {
-            if (!d.getElementById(id)) {
+                    e.preventDefault();
-                js = d.createElement(s);
+                    showCollectorDialog();
-                js.id = id;
+                });
-                js.src = "//platform.twitter.com/widgets.js";
-                fjs.parentNode.insertBefore(js, fjs);
              }
-        }(document, "script", "twitter-wjs");</script>
+        },
+        "703b9822":{
+            triggerFunction: function(showCollectorDialog) {
+                //Requries that jQuery is available!
+                jQuery("#reportIssueBtn").click(function(e) {
+                    e.preventDefault();
+                    showCollectorDialog();
+                });
+            }
+        }
+     });
+    </script>
+
+    <div class="span1 offset3">
+        <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.wisemapping.com" data-text="Check out this site" data-via="wisemapping" data-related="wisemapping">Tweet</a>
+        <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
     </div>
 
     <div class="span1">
@@ -35,10 +51,10 @@
     </div>
     <div class="span4">
         <p style="text-align: center;">
-            <a href="https://groups.google.com/d/forum/wisemapping-support"><spring:message code="SUPPORT"/></a> |
+            <a href="" id="feedbackBtn"><spring:message code="FEEDBACK"/></a> |
-            <a href="mailto:feedback@wisemapping.com"><spring:message code="FEEDBACK"/></a> |
+            <a href="" id="reportIssueBtn"><spring:message code="REPORT_BUG"/></a> |
-            <a href="mailto:dev@wisemapping.com"><spring:message code="CONTACT_US"/></a> |
+            <a href="mailto:team@wisemapping.com"><spring:message code="CONTACT_US"/></a> |
-            <a href="http://www.wisemapping.org/license"><spring:message code="LICENSE"/></a><br/>
+            <a href="https://wisemapping.atlassian.net/wiki/display/WS/License  "><spring:message code="LICENSE"/></a><br/>
             <a href="http://www.wisemapping.org/"><spring:message code="COPYRIGHT"/></a>
         </p>
 

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());
 %>