LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

modofies sql deletes for docrepo to ensure correct constraint integrityk 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4026 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
tosmers 2016-04-25 14:19:07 +00:00
parent 189c432378
commit 62b377fbe8
5 changed files with 54 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ccm-core/pom.xml
View File

@ -187,6 +187,8 @@
<scope>test</scope>
</dependency>
<!-- Export Import Libraries -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
@ -200,18 +202,21 @@
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
</dependency>
<dependency> <!-- for xml ex-/import -->
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
</dependency>
<dependency> <!-- better xml library -->
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</dependency>
<dependency> <!-- for csv ex-/import -->
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
</dependency>
</dependencies>

7
ccm-docrepo/src/main/java/org/libreccm/docrepo/AbstractResourceRepository.java
View File

@ -28,6 +28,7 @@ import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
/**
@ -198,4 +199,10 @@ public abstract class AbstractResourceRepository<T extends AbstractResource>
*/
protected abstract TypedQuery<T> getFindForModifierQuery();
//Todo
@Override
public void initNewEntity(final T entity) {
entity.setUuid(UUID.randomUUID().toString());
}
}

19
ccm-docrepo/src/test/java/org/libreccm/docrepo/portation/FilePortationTest.java
View File

@ -31,24 +31,22 @@ import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
import org.jboss.shrinkwrap.resolver.api.maven.PomEquippedResolveStage;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.*;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.libreccm.docrepo.File;
import org.libreccm.docrepo.FileMarshaller;
import org.libreccm.docrepo.FileRepository;
import org.libreccm.portation.Format;
import org.libreccm.portation.Marshals;
import org.libreccm.tests.categories.IntegrationTest;
import javax.inject.Inject;
import java.io.FileWriter;
import java.io.IOException;
import java.util.Collections;
import java.util.Date;
import java.util.UUID;
import java.util.List;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.assertThat;
@ -179,7 +177,6 @@ public class FilePortationTest {
@InSequence(20)
public void fileShouldBeCreated() {
file = new File();
file.setUuid(UUID.randomUUID().toString());
file.setName("testname");
file.setDescription("this is a text description");
file.setPath(filePath + "test2.txt");
@ -194,10 +191,10 @@ public class FilePortationTest {
@Test
@InSequence(100)
public void xmlShouldBeCreated() {
// fileMarshaller.prepare(Format.XML, filePath + "test1.xml");
// List<File> fileList = Collections.singletonList(file);
//
// fileMarshaller.exportList(fileList);
fileMarshaller.prepare(Format.XML, filePath + "test1.xml");
List<File> fileList = Collections.singletonList(file);
fileMarshaller.exportList(fileList);
}
@Test

10
ccm-docrepo/src/test/resources/scripts/h2-cleanup.sql
View File

@ -1,3 +1,13 @@
DELETE FROM ccm_docrepo.blob_objects;
DELETE FROM ccm_docrepo.files;
DELETE FROM ccm_docrepo.folders;
DELETE FROM ccm_docrepo.resources;
DELETE FROM ccm_docrepo.repositories;
DELETE FROM ccm_core.settings_big_decimal;
DELETE FROM ccm_core.settings_boolean;

30
pom.xml
View File

@ -9,6 +9,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!--<ccm.version>7.0.0-SNAPSHOT</ccm.version>-->
<jackson-core-version>2.6.0</jackson-core-version>
</properties>
<groupId>org.libreccm</groupId>
@ -426,38 +427,45 @@
<version>1.2</version>
</dependency>
<!-- Export Import Libraries -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.7.0</version>
<version>${jackson-core-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.7.0</version>
<version>${jackson-core-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.7.0</version>
<version>${jackson-core-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>${jackson-core-version}</version>
</dependency>
<dependency> <!-- for xml ex-/import -->
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.7.0</version>
<version>${jackson-core-version}</version>
</dependency>
<dependency> <!-- for csv ex-/import -->
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
<version>2.7.0</version>
</dependency>
<dependency> <!-- better xml library -->
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
<version>4.4.1</version>
</dependency>
<dependency> <!-- for csv ex-/import -->
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
<version>${jackson-core-version}</version>
</dependency>
<!--
**********************
Dependencies for tests