vmario/docs
1
0
Fork 0
mirror of https://github.com/sismics/docs.git synced 2024-11-15 02:37:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bump version to 1.4-SNAPSHOT

Browse Source
This commit is contained in:
jendib 2016-05-09 15:23:02 +02:00
parent 9506e9b8b4
commit 4a512af178
10 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs-core/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.sismics.docs</groupId> <groupId>com.sismics.docs</groupId>
<artifactId>docs-parent</artifactId> <artifactId>docs-parent</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.4-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

11
docs-core/src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java
View File

@ -1,6 +1,12 @@
package com.sismics.docs.core.dao.jpa; package com.sismics.docs.core.dao.jpa;
import java.util.*; import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import javax.persistence.EntityManager; import javax.persistence.EntityManager;
import javax.persistence.NoResultException; import javax.persistence.NoResultException;
@ -8,11 +14,8 @@ import javax.persistence.Query;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.sismics.docs.core.constant.AuditLogType; import com.sismics.docs.core.constant.AuditLogType;
import com.sismics.docs.core.dao.jpa.criteria.GroupCriteria;
import com.sismics.docs.core.dao.jpa.criteria.TagCriteria; import com.sismics.docs.core.dao.jpa.criteria.TagCriteria;
import com.sismics.docs.core.dao.jpa.dto.GroupDto;
import com.sismics.docs.core.dao.jpa.dto.TagDto; import com.sismics.docs.core.dao.jpa.dto.TagDto;
import com.sismics.docs.core.dao.jpa.dto.TagStatDto;
import com.sismics.docs.core.model.jpa.DocumentTag; import com.sismics.docs.core.model.jpa.DocumentTag;
import com.sismics.docs.core.model.jpa.Tag; import com.sismics.docs.core.model.jpa.Tag;
import com.sismics.docs.core.util.AuditLogUtil; import com.sismics.docs.core.util.AuditLogUtil;

1
docs-core/src/main/java/com/sismics/util/jpa/DbOpenHelper.java
View File

@ -5,7 +5,6 @@ import java.io.FilenameFilter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.Writer;
import java.sql.Connection; import java.sql.Connection;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;

1
docs-core/src/test/java/com/sismics/docs/core/util/TestFileUtil.java
View File

@ -9,7 +9,6 @@ import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.io.ByteStreams;
import com.google.common.io.Resources; import com.google.common.io.Resources;
import com.sismics.docs.core.dao.jpa.dto.DocumentDto; import com.sismics.docs.core.dao.jpa.dto.DocumentDto;
import com.sismics.docs.core.model.jpa.File; import com.sismics.docs.core.model.jpa.File;

2
docs-stress/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.sismics.docs</groupId> <groupId>com.sismics.docs</groupId>
<artifactId>docs-parent</artifactId> <artifactId>docs-parent</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.4-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
docs-web-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.sismics.docs</groupId> <groupId>com.sismics.docs</groupId>
<artifactId>docs-parent</artifactId> <artifactId>docs-parent</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.4-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

2
docs-web/pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>com.sismics.docs</groupId> <groupId>com.sismics.docs</groupId>
<artifactId>docs-parent</artifactId> <artifactId>docs-parent</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.4-SNAPSHOT</version>
<relativePath>..</relativePath> <relativePath>..</relativePath>
</parent> </parent>

6
docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java
View File

@ -37,10 +37,6 @@ import java.util.Map;
*/ */
@Path("/theme") @Path("/theme")
public class ThemeResource extends BaseResource { public class ThemeResource extends BaseResource {
// Filenames for images in theme directory
private static final String LOGO_IMAGE = "logo";
private static final String BACKGROUND_IMAGE = "background";
/** /**
* Returns custom CSS stylesheet. * Returns custom CSS stylesheet.
* *
@ -162,7 +158,7 @@ public class ThemeResource extends BaseResource {
if (Files.exists(filePath)) { if (Files.exists(filePath)) {
inputStream = Files.newInputStream(filePath); inputStream = Files.newInputStream(filePath);
} else { } else {
inputStream = getClass().getResource("/image/" + (type.equals(LOGO_IMAGE) ? "logo.png" : "background.jpg")).openStream(); inputStream = getClass().getResource("/image/" + (type.equals("logo") ? "logo.png" : "background.jpg")).openStream();
} }
ByteStreams.copy(inputStream, outputStream); ByteStreams.copy(inputStream, outputStream);
} finally { } finally {

1
docs-web/src/test/java/com/sismics/docs/rest/TestTagResource.java
View File

@ -2,7 +2,6 @@ package com.sismics.docs.rest;
import javax.json.JsonArray; import javax.json.JsonArray;
import javax.json.JsonObject; import javax.json.JsonObject;
import javax.json.JsonValue;
import javax.ws.rs.client.Entity; import javax.ws.rs.client.Entity;
import javax.ws.rs.core.Form; import javax.ws.rs.core.Form;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.sismics.docs</groupId> <groupId>com.sismics.docs</groupId>
<artifactId>docs-parent</artifactId> <artifactId>docs-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.0-SNAPSHOT</version> <version>1.4-SNAPSHOT</version>
<name>Docs Parent</name> <name>Docs Parent</name>