Add Jira Issue Integration.
Conflicts: wise-webapp/pom.xml
This commit is contained in:
Paulo Gustavo Veiga
@@ -284,19 +284,14 @@
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.mangofactory</groupId>
|
||||
<artifactId>swagger-springmvc</artifactId>
|
||||
<version>0.6.6</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.12.4</version>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-core-asl</artifactId>
|
||||
<version>1.9.4</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.jackson</groupId>
|
||||
<artifactId>jackson-mapper-asl</artifactId>
|
||||
<version>1.9.13</version>
|
||||
<version>1.9.4</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@@ -323,55 +318,115 @@
|
||||
<artifactId>jsoup</artifactId>
|
||||
<version>1.7.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.mangofactory</groupId>
|
||||
<artifactId>swagger-springmvc</artifactId>
|
||||
<version>0.6.6</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>hsqldb</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>sql-maven-plugin</artifactId>
|
||||
<version>1.5</version>
|
||||
|
||||
<configuration>
|
||||
<driver>org.hsqldb.jdbc.JDBCDriver</driver>
|
||||
<url>jdbc:hsqldb:file:${project.build.directory}/db/wisemapping</url>
|
||||
<username>sa</username>
|
||||
</configuration>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<version>5.1.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hsqldb</groupId>
|
||||
<artifactId>hsqldb</artifactId>
|
||||
<version>2.2.8</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<executions>
|
||||
<execution>
|
||||
<id>drop-schemas</id>
|
||||
<phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>execute</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<onError>continue</onError>
|
||||
<orderFile>descending</orderFile>
|
||||
<fileset>
|
||||
<basedir>${project.basedir}</basedir>
|
||||
<includes>
|
||||
<include>config/database/hsql/drop-schemas.sql</include>
|
||||
<include>config/database/hsql/create-schemas.sql</include>
|
||||
<include>config/database/hsql/apopulate-schemas.sql</include>
|
||||
</includes>
|
||||
</fileset>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>mysqldb</id>
|
||||
<activation>
|
||||
<activeByDefault>false</activeByDefault>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>sql-maven-plugin</artifactId>
|
||||
<version>1.5</version>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<version>5.1.5</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>init-schema</id>
|
||||
<goals>
|
||||
<goal>execute</goal>
|
||||
</goals>
|
||||
<phase>prepare-package</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<driver>com.mysql.jdbc.Driver</driver>
|
||||
<username>root</username>
|
||||
<password></password>
|
||||
<url>jdbc:mysql://127.0.0.1:3306/?useUnicode=true&characterEncoding=UTF-8</url>
|
||||
<autocommit>false</autocommit>
|
||||
<srcFiles>
|
||||
<srcFile>config/database/mysql/create-database.sql</srcFile>
|
||||
<srcFile>config/database/mysql/create-schemas.sql</srcFile>
|
||||
<srcFile>config/database/mysql/apopulate-schemas.sql</srcFile>
|
||||
</srcFiles>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>sql-maven-plugin</artifactId>
|
||||
<version>1.5</version>
|
||||
|
||||
<configuration>
|
||||
<driver>org.hsqldb.jdbc.JDBCDriver</driver>
|
||||
<url>jdbc:hsqldb:file:${project.build.directory}/db/wisemapping</url>
|
||||
<username>sa</username>
|
||||
</configuration>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<version>5.1.5</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hsqldb</groupId>
|
||||
<artifactId>hsqldb</artifactId>
|
||||
<version>2.2.8</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<executions>
|
||||
<execution>
|
||||
<id>drop-schemas</id>
|
||||
<phase>prepare-package</phase>
|
||||
<goals>
|
||||
<goal>execute</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<onError>continue</onError>
|
||||
<orderFile>descending</orderFile>
|
||||
<fileset>
|
||||
<basedir>${project.basedir}</basedir>
|
||||
<includes>
|
||||
<include>config/database/hsql/drop-schemas.sql</include>
|
||||
<include>config/database/hsql/create-schemas.sql</include>
|
||||
<include>config/database/hsql/apopulate-schemas.sql</include>
|
||||
</includes>
|
||||
</fileset>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>native2ascii-maven-plugin</artifactId>
|
||||
@@ -452,16 +507,14 @@
|
||||
</webResources>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.mortbay.jetty</groupId>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-maven-plugin</artifactId>
|
||||
<version>8.1.14.v20131031</version>
|
||||
<version>9.1.1.v20140108</version>
|
||||
<configuration>
|
||||
<stopKey>foo</stopKey>
|
||||
<stopPort>9999</stopPort>
|
||||
@@ -484,7 +537,6 @@
|
||||
<value>${project.build.directory}</value>
|
||||
</systemProperty>
|
||||
</systemProperties>
|
||||
<!--<scanIntervalSeconds>10</scanIntervalSeconds>-->
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
}
|
||||
|
||||
|
||||
@@ -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 ...
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -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">
|
||||
<div class="span1 offset3">
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="wisemapping"
|
||||
data-related="wisemapping">Tweet</a>
|
||||
<script>!function (d, s, id) {
|
||||
var js, fjs = d.getElementsByTagName(s)[0];
|
||||
if (!d.getElementById(id)) {
|
||||
js = d.createElement(s);
|
||||
js.id = id;
|
||||
js.src = "//platform.twitter.com/widgets.js";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
<script type="text/javascript">
|
||||
window.ATL_JQ_PAGE_PROPS = $.extend(window.ATL_JQ_PAGE_PROPS, {
|
||||
"a47981d6": {
|
||||
triggerFunction: function(showCollectorDialog) {
|
||||
//Requries that jQuery is available!
|
||||
jQuery("#feedbackBtn").click(function(e) {
|
||||
e.preventDefault();
|
||||
showCollectorDialog();
|
||||
});
|
||||
}
|
||||
},
|
||||
"703b9822":{
|
||||
triggerFunction: function(showCollectorDialog) {
|
||||
//Requries that jQuery is available!
|
||||
jQuery("#reportIssueBtn").click(function(e) {
|
||||
e.preventDefault();
|
||||
showCollectorDialog();
|
||||
});
|
||||
}
|
||||
}(document, "script", "twitter-wjs");</script>
|
||||
}
|
||||
});
|
||||
</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="mailto:feedback@wisemapping.com"><spring:message code="FEEDBACK"/></a> |
|
||||
<a href="mailto:dev@wisemapping.com"><spring:message code="CONTACT_US"/></a> |
|
||||
<a href="http://www.wisemapping.org/license"><spring:message code="LICENSE"/></a><br/>
|
||||
<a href="" id="feedbackBtn"><spring:message code="FEEDBACK"/></a> |
|
||||
<a href="" id="reportIssueBtn"><spring:message code="REPORT_BUG"/></a> |
|
||||
<a href="mailto:team@wisemapping.com"><spring:message code="CONTACT_US"/></a> |
|
||||
<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>
|
||||
|
||||
|
||||
@@ -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());
|
||||
%>
|
||||
|
||||
Reference in New Issue
Block a user