inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin' into feature/RM-6928_Renditions

Browse Source
This commit is contained in:
Ross Gale
2019-09-27 11:03:15 +01:00
parent d50b552be6 c2e2536389
commit 78cfa3a879
17 changed files with 233 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

309
pom.xml
View File

@@ -258,32 +258,26 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>${fabric8.maven.version}</version> <version>${fabric8.docker.version}</version>
<configuration>
<images>
<image>
<name>${image.name}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
<executions> <executions>
<execution> <execution>
<id>build-image</id> <id>build-image</id>
<phase>install</phase> <!-- This will still be executed if the tests are skipped. -->
<goals>
<goal>build</goal>
</goals>
</execution>
<execution>
<id>build-image-verify</id>
<phase>verify</phase> <phase>verify</phase>
<goals> <goals>
<goal>build</goal> <goal>build</goal>
</goals> </goals>
<configuration>
<images>
<image>
<name>${image.name}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@@ -300,19 +294,8 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>${fabric8.maven.version}</version> <version>${fabric8.docker.version}</version>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
<executions> <executions>
<execution> <execution>
<id>build-push-image</id> <id>build-push-image</id>
@@ -321,6 +304,17 @@
<goal>build</goal> <goal>build</goal>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@@ -338,25 +332,8 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>${fabric8.maven.version}</version> <version>${fabric8.docker.version}</version>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
<executions> <executions>
<execution> <execution>
<id>build-push-image</id> <id>build-push-image</id>
@@ -365,6 +342,23 @@
<goal>build</goal> <goal>build</goal>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
<configuration>
<images>
<image>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
<image>
<name>${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@@ -382,19 +376,8 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>${fabric8.maven.version}</version> <version>${fabric8.docker.version}</version>
<configuration>
<images>
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
<executions> <executions>
<execution> <execution>
<id>build-push-image</id> <id>build-push-image</id>
@@ -403,6 +386,17 @@
<goal>build</goal> <goal>build</goal>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
<configuration>
<images>
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@@ -420,25 +414,8 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>${fabric8.maven.version}</version> <version>${fabric8.docker.version}</version>
<configuration>
<images>
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
<image>
<name>${image.name}:${project.version}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
<executions> <executions>
<execution> <execution>
<id>build-push-image</id> <id>build-push-image</id>
@@ -447,6 +424,93 @@
<goal>build</goal> <goal>build</goal>
<goal>push</goal> <goal>push</goal>
</goals> </goals>
<configuration>
<images>
<image>
<name>${image.name}:${project.version}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
<image>
<name>${image.name}:${project.version}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
<profile>
<id>start-db</id>
<activation>
<property>
<name>skip.integrationtests</name>
<value>false</value>
</property>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${fabric8.docker.version}</version>
<executions>
<execution>
<id>start</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
<configuration>
<images>
<image>
<alias>test-database</alias>
<name>postgres:${postgres.version}</name>
<run>
<ports>
<port>${database.port}:${postgresql.port}</port>
</ports>
<env>
<POSTGRES_PASSWORD>${alfresco.db.password}</POSTGRES_PASSWORD>
<POSTGRES_USER>${alfresco.db.username}</POSTGRES_USER>
<POSTGRES_DB>${alfresco.test.db.name}</POSTGRES_DB>
</env>
<cmd>
<shell>-c max_connections=300</shell>
</cmd>
<wait>
<log>database system is ready to accept connections</log>
<time>20000</time>
</wait>
</run>
</image>
<image>
<name>alfresco/alfresco-activemq:${activemq.version}</name>
<run>
<ports>
<port>${activemq.port1}:${activemq.port1}</port>
<port>${activemq.port2}:${activemq.port2}</port>
</ports>
</run>
</image>
</images>
</configuration>
</execution>
<execution>
<id>stop</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
@@ -484,8 +548,10 @@
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>
<maven.war.plugin.version>3.2.2</maven.war.plugin.version> <maven.war.plugin.version>3.2.2</maven.war.plugin.version>
<maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies> <maven.alfresco.includeDependencies>false</maven.alfresco.includeDependencies>
<maven.build.sourceVersion>1.8</maven.build.sourceVersion> <java.version>11</java.version>
<maven.build.testSourceVersion>1.8</maven.build.testSourceVersion> <maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<testJavaVersion>${java.version}</testJavaVersion>
<maven.buildhelper.version>1.9.1</maven.buildhelper.version> <maven.buildhelper.version>1.9.1</maven.buildhelper.version>
<maven.compiler.version>3.8.0</maven.compiler.version> <maven.compiler.version>3.8.0</maven.compiler.version>
<maven.enforcer.plugin>3.0.0-M2</maven.enforcer.plugin> <maven.enforcer.plugin>3.0.0-M2</maven.enforcer.plugin>
@@ -520,7 +586,6 @@
<app.properties.test.include>**</app.properties.test.include> <app.properties.test.include>**</app.properties.test.include>
<app.properties.test.folder>src/test/properties/local</app.properties.test.folder> <app.properties.test.folder>src/test/properties/local</app.properties.test.folder>
<fabric8.maven.version>3.5.37</fabric8.maven.version>
<image.name>imageNameNotSet</image.name> <image.name>imageNameNotSet</image.name>
<image.tag>latest</image.tag> <image.tag>latest</image.tag>
<image.registry>quay.io</image.registry> <image.registry>quay.io</image.registry>
@@ -603,13 +668,17 @@
<configuration> <configuration>
<rules> <rules>
<requireJavaVersion> <requireJavaVersion>
<version>[1.8.0,)</version> <version>[${java.version},)</version>
</requireJavaVersion> </requireJavaVersion>
</rules> </rules>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId> <artifactId>build-helper-maven-plugin</artifactId>
@@ -838,8 +907,8 @@
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.version}</version> <version>${maven.compiler.version}</version>
<configuration> <configuration>
<source>${maven.build.sourceVersion}</source> <source>${maven.compiler.source}</source>
<target>${maven.build.sourceVersion}</target> <target>${maven.compiler.target}</target>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@@ -849,8 +918,8 @@
<goal>testCompile</goal> <goal>testCompile</goal>
</goals> </goals>
<configuration> <configuration>
<source>${maven.build.testSourceVersion}</source> <source>${testJavaVersion}</source>
<target>${maven.build.testSourceVersion}</target> <target>${testJavaVersion}</target>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@@ -945,7 +1014,7 @@
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<configuration> <configuration>
<doclint>none</doclint> <doclint>none</doclint>
<source>8</source> <source>${java.version}</source>
</configuration> </configuration>
</plugin> </plugin>
@@ -1119,62 +1188,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>${fabric8.docker.version}</version>
<configuration>
<images>
<image>
<alias>test-database</alias>
<name>postgres:${postgres.version}</name>
<run>
<ports>
<port>${database.port}:${postgresql.port}</port>
</ports>
<env>
<POSTGRES_PASSWORD>${alfresco.db.password}</POSTGRES_PASSWORD>
<POSTGRES_USER>${alfresco.db.username}</POSTGRES_USER>
<POSTGRES_DB>${alfresco.test.db.name}</POSTGRES_DB>
</env>
<cmd>
<shell>-c max_connections=300</shell>
</cmd>
<wait>
<log>database system is ready to accept connections</log>
<time>20000</time>
</wait>
</run>
</image>
<image>
<name>alfresco/alfresco-activemq:${activemq.version}</name>
<run>
<ports>
<port>${activemq.port1}:${activemq.port1}</port>
<port>${activemq.port2}:${activemq.port2}</port>
</ports>
</run>
</image>
</images>
<skip>${skip.integrationtests}</skip>
</configuration>
<executions>
<execution>
<id>start</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>stop</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>

2
rm-automation/pom.xml
View File

@@ -24,8 +24,6 @@
</modules> </modules>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<suiteXmlFile>testng.xml</suiteXmlFile> <suiteXmlFile>testng.xml</suiteXmlFile>
<skip.automationtests>true</skip.automationtests> <skip.automationtests>true</skip.automationtests>
</properties> </properties>

21
rm-automation/rm-automation-community-rest-api/pom.xml
View File

@@ -12,12 +12,12 @@
</parent> </parent>
<properties> <properties>
<maven.build.sourceVersion>1.8</maven.build.sourceVersion>
<maven.javadoc.skip>false</maven.javadoc.skip> <maven.javadoc.skip>false</maven.javadoc.skip>
<ags.share>alfresco-governance-services-community-share</ags.share> <ags.share>alfresco-governance-services-community-share</ags.share>
<ags.repo>alfresco-governance-services-community-repo</ags.repo> <ags.repo>alfresco-governance-services-community-repo</ags.repo>
<tas.restapi.version>6.0.0.3</tas.restapi.version> <tas.restapi.version>6.0.1.2</tas.restapi.version>
<fluent.json.version>2.0.0</fluent.json.version> <fluent.json.version>2.0.0</fluent.json.version>
<jackson.databind.version>2.7.7</jackson.databind.version>
</properties> </properties>
<build> <build>
@@ -56,12 +56,24 @@
<groupId>org.alfresco.tas</groupId> <groupId>org.alfresco.tas</groupId>
<artifactId>restapi-test</artifactId> <artifactId>restapi-test</artifactId>
<version>${tas.restapi.version}</version> <version>${tas.restapi.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco.tas</groupId> <groupId>org.alfresco.tas</groupId>
<artifactId>restapi-test</artifactId> <artifactId>restapi-test</artifactId>
<version>${tas.restapi.version}</version> <version>${tas.restapi.version}</version>
<type>test-jar</type> <type>test-jar</type>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
@@ -90,5 +102,10 @@
<artifactId>docker-java</artifactId> <artifactId>docker-java</artifactId>
<version>3.0.14</version> <version>3.0.14</version>
</dependency> </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind.version}</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

2
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/core/RMRestWrapper.java
View File

@@ -26,7 +26,7 @@
*/ */
package org.alfresco.rest.core; package org.alfresco.rest.core;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import org.alfresco.rest.exception.EmptyJsonResponseException; import org.alfresco.rest.exception.EmptyJsonResponseException;
import org.alfresco.rest.model.RestErrorModel; import org.alfresco.rest.model.RestErrorModel;

2
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/GSCoreAPI.java
View File

@@ -29,7 +29,7 @@ package org.alfresco.rest.rm.community.requests.gscore;
import static java.lang.Integer.parseInt; import static java.lang.Integer.parseInt;
import static java.lang.String.format; import static java.lang.String.format;
import com.jayway.restassured.RestAssured; import io.restassured.RestAssured;
import org.alfresco.rest.core.RMRestProperties; import org.alfresco.rest.core.RMRestProperties;
import org.alfresco.rest.core.RMRestWrapper; import org.alfresco.rest.core.RMRestWrapper;

14
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RMUserAPI.java
View File

@@ -26,17 +26,17 @@
*/ */
package org.alfresco.rest.rm.community.requests.gscore.api; package org.alfresco.rest.rm.community.requests.gscore.api;
import static com.jayway.restassured.RestAssured.basic;
import static com.jayway.restassured.RestAssured.given;
import static org.jglue.fluentjson.JsonBuilderFactory.buildObject; import static org.jglue.fluentjson.JsonBuilderFactory.buildObject;
import static org.springframework.http.HttpStatus.OK; import static org.springframework.http.HttpStatus.OK;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.response.Response; import io.restassured.http.ContentType;
import com.jayway.restassured.specification.RequestSpecification; import io.restassured.response.Response;
import io.restassured.specification.RequestSpecification;
import static io.restassured.RestAssured.basic;
import static io.restassured.RestAssured.given;
import org.alfresco.dataprep.AlfrescoHttpClient; import org.alfresco.dataprep.AlfrescoHttpClient;
import org.alfresco.dataprep.AlfrescoHttpClientFactory; import org.alfresco.dataprep.AlfrescoHttpClientFactory;

4
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordFolderAPI.java
View File

@@ -45,8 +45,8 @@ import java.util.Iterator;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import org.alfresco.rest.core.RMRestWrapper; import org.alfresco.rest.core.RMRestWrapper;
import org.alfresco.rest.rm.community.model.record.Record; import org.alfresco.rest.rm.community.model.record.Record;

3
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/RecordsAPI.java
View File

@@ -37,13 +37,14 @@ import static org.springframework.http.HttpMethod.GET;
import static org.springframework.http.HttpMethod.POST; import static org.springframework.http.HttpMethod.POST;
import static org.springframework.http.HttpMethod.PUT; import static org.springframework.http.HttpMethod.PUT;
import com.jayway.restassured.response.ResponseBody;
import org.alfresco.rest.core.RMRestWrapper; import org.alfresco.rest.core.RMRestWrapper;
import org.alfresco.rest.rm.community.model.record.Record; import org.alfresco.rest.rm.community.model.record.Record;
import org.alfresco.rest.rm.community.model.record.RecordBodyFile; import org.alfresco.rest.rm.community.model.record.RecordBodyFile;
import org.alfresco.rest.rm.community.requests.RMModelRequest; import org.alfresco.rest.rm.community.requests.RMModelRequest;
import io.restassured.response.ResponseBody;
/** /**
* Records REST API Wrapper * Records REST API Wrapper
* *

5
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/UnfiledContainerAPI.java
View File

@@ -44,8 +44,9 @@ import java.util.Iterator;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.jayway.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.builder.RequestSpecBuilder;
import io.restassured.http.ContentType;
import org.alfresco.rest.core.RMRestWrapper; import org.alfresco.rest.core.RMRestWrapper;
import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainer; import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainer;

4
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/requests/gscore/api/UnfiledRecordFolderAPI.java
View File

@@ -45,8 +45,8 @@ import java.util.Iterator;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.jayway.restassured.builder.RequestSpecBuilder; import io.restassured.builder.RequestSpecBuilder;
import com.jayway.restassured.http.ContentType; import io.restassured.http.ContentType;
import org.alfresco.rest.core.RMRestWrapper; import org.alfresco.rest.core.RMRestWrapper;
import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainerChild; import org.alfresco.rest.rm.community.model.unfiledcontainer.UnfiledContainerChild;

1
rm-automation/rm-automation-community-rest-api/src/main/resources/META-INF/services/javax.ws.rs.client.ClientBuilder Normal file
View File

@@ -0,0 +1 @@
org.glassfish.jersey.client.JerseyClientBuilder

2
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/files/DeclareDocumentAsRecordTests.java
View File

@@ -261,7 +261,7 @@ public class DeclareDocumentAsRecordTests extends BaseRMRestTest
public void declareAsRecordAFileWithARecordVersion() throws Exception public void declareAsRecordAFileWithARecordVersion() throws Exception
{ {
STEP("Create a file."); STEP("Create a file.");
FileModel testFile = dataContent.usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN); FileModel testFile = dataContent.usingAdmin().usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
STEP("Declare file version as record and check that record is successfully created."); STEP("Declare file version as record and check that record is successfully created.");
recordsAPI.declareDocumentVersionAsRecord(getAdminUser().getUsername(), getAdminUser().getPassword(), testSite.getId(), recordsAPI.declareDocumentVersionAsRecord(getAdminUser().getUsername(), getAdminUser().getPassword(), testSite.getId(),

6
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/AddToHoldsTests.java
View File

@@ -116,11 +116,11 @@ public class AddToHoldsTests extends BaseRMRestTest
STEP("Create test files."); STEP("Create test files.");
testSite = dataSite.usingAdmin().createPublicRandomSite(); testSite = dataSite.usingAdmin().createPublicRandomSite();
documentHeld = dataContent.usingSite(testSite) documentHeld = dataContent.usingAdmin().usingSite(testSite)
.createContent(CMISUtil.DocumentType.TEXT_PLAIN); .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
contentToAddToHold = dataContent.usingSite(testSite) contentToAddToHold = dataContent.usingAdmin().usingSite(testSite)
.createContent(CMISUtil.DocumentType.TEXT_PLAIN); .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
contentAddToHoldNoPermission = dataContent.usingSite(testSite) contentAddToHoldNoPermission = dataContent.usingAdmin().usingSite(testSite)
.createContent(CMISUtil.DocumentType.TEXT_PLAIN); .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
STEP("Add the content to the hold."); STEP("Add the content to the hold.");

10
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/hold/RemoveFromHoldsTests.java
View File

@@ -106,7 +106,7 @@ public class RemoveFromHoldsTests extends BaseRMRestTest
STEP("Create test files."); STEP("Create test files.");
testSite = dataSite.usingAdmin().createPublicRandomSite(); testSite = dataSite.usingAdmin().createPublicRandomSite();
privateSite = dataSite.usingAdmin().createPrivateRandomSite(); privateSite = dataSite.usingAdmin().createPrivateRandomSite();
contentHeld = dataContent.usingSite(testSite) contentHeld = dataContent.usingAdmin().usingSite(testSite)
.createContent(CMISUtil.DocumentType.TEXT_PLAIN); .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
contentAddToManyHolds = dataContent.usingSite(testSite) contentAddToManyHolds = dataContent.usingSite(testSite)
.createContent(CMISUtil.DocumentType.TEXT_PLAIN); .createContent(CMISUtil.DocumentType.TEXT_PLAIN);
@@ -212,9 +212,9 @@ public class RemoveFromHoldsTests extends BaseRMRestTest
UserModel user = roleService.createUserWithRMRole(ROLE_RM_MANAGER.roleId); UserModel user = roleService.createUserWithRMRole(ROLE_RM_MANAGER.roleId);
getRestAPIFactory().getRMUserAPI().addUserPermission(holdNodeRefOne, user, PERMISSION_FILING); getRestAPIFactory().getRMUserAPI().addUserPermission(holdNodeRefOne, user, PERMISSION_FILING);
//create files that will be removed from hold //create files that will be removed from hold
FileModel contentNoHoldPerm = dataContent.usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN); FileModel contentNoHoldPerm = dataContent.usingAdmin().usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
FileModel contentNoHoldCap = dataContent.usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN); FileModel contentNoHoldCap = dataContent.usingAdmin().usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
FileModel privateFile = dataContent.usingSite(privateSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN); FileModel privateFile = dataContent.usingAdmin().usingSite(privateSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
//add files to hold //add files to hold
holdsAPI.addItemsToHolds(getAdminUser().getUsername(), getAdminUser().getPassword(), holdsAPI.addItemsToHolds(getAdminUser().getUsername(), getAdminUser().getPassword(),
asList(recordFolder.getId(), contentNoHoldCap.getNodeRefWithoutVersion(), asList(recordFolder.getId(), contentNoHoldCap.getNodeRefWithoutVersion(),
@@ -288,7 +288,7 @@ public class RemoveFromHoldsTests extends BaseRMRestTest
PERMISSION_READ_RECORDS); PERMISSION_READ_RECORDS);
getRestAPIFactory().getRMUserAPI().addUserPermission(holdNodeRefOne, user, PERMISSION_FILING); getRestAPIFactory().getRMUserAPI().addUserPermission(holdNodeRefOne, user, PERMISSION_FILING);
//create file that will be removed from hold //create file that will be removed from hold
FileModel contentPermission = dataContent.usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN); FileModel contentPermission = dataContent.usingAdmin().usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
//add files to hold //add files to hold
holdsAPI.addItemsToHolds(getAdminUser().getUsername(), getAdminUser().getPassword(), holdsAPI.addItemsToHolds(getAdminUser().getUsername(), getAdminUser().getPassword(),

8
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/records/DeleteRecordTests.java
View File

@@ -317,7 +317,7 @@ public class DeleteRecordTests extends BaseRMRestTest
{ {
STEP("Create a file."); STEP("Create a file.");
testSite = dataSite.usingAdmin().createPublicRandomSite(); testSite = dataSite.usingAdmin().createPublicRandomSite();
FileModel testFile = dataContent.usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN); FileModel testFile = dataContent.usingAdmin().usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
STEP("Create a copy of the file."); STEP("Create a copy of the file.");
RestNodeModel copyOfTestFile = copyNode(testFile.getNodeRefWithoutVersion(), testSite.getGuid()); RestNodeModel copyOfTestFile = copyNode(testFile.getNodeRefWithoutVersion(), testSite.getGuid());
@@ -352,8 +352,8 @@ public class DeleteRecordTests extends BaseRMRestTest
{ {
STEP("Create a file."); STEP("Create a file.");
testSite = dataSite.usingAdmin().createPublicRandomSite(); testSite = dataSite.usingAdmin().createPublicRandomSite();
FileModel testFile = dataContent.usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN); FileModel testFile = dataContent.usingAdmin().usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
FolderModel folderModel = dataContent.usingSite(testSite).createFolder(); FolderModel folderModel = dataContent.usingAdmin().usingSite(testSite).createFolder();
STEP("Create a copy of the file."); STEP("Create a copy of the file.");
RestNodeModel copy = copyNode(testFile.getNodeRefWithoutVersion(), folderModel.getNodeRefWithoutVersion()); RestNodeModel copy = copyNode(testFile.getNodeRefWithoutVersion(), folderModel.getNodeRefWithoutVersion());
@@ -406,7 +406,7 @@ public class DeleteRecordTests extends BaseRMRestTest
{ {
STEP("Create a file."); STEP("Create a file.");
testSite = dataSite.usingAdmin().createPublicRandomSite(); testSite = dataSite.usingAdmin().createPublicRandomSite();
FileModel testFile = dataContent.usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN); FileModel testFile = dataContent.usingAdmin().usingSite(testSite).createContent(CMISUtil.DocumentType.TEXT_PLAIN);
STEP("Declare file version as record."); STEP("Declare file version as record.");
recordsAPI.declareDocumentVersionAsRecord(getAdminUser().getUsername(), getAdminUser().getPassword(), testSite.getId(), recordsAPI.declareDocumentVersionAsRecord(getAdminUser().getUsername(), getAdminUser().getPassword(), testSite.getId(),

25
rm-community/rm-community-repo/pom.xml
View File

@@ -628,7 +628,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@@ -639,7 +639,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@@ -650,7 +650,7 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@@ -661,7 +661,24 @@
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>start-db</id>
<activation>
<property>
<name>skip.integrationtests</name>
<value>false</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

2
rm-community/rm-community-rest-api-explorer/pom.xml
View File

@@ -11,8 +11,6 @@
</parent> </parent>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.javadoc.skip>false</maven.javadoc.skip> <maven.javadoc.skip>false</maven.javadoc.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>