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 'remotes/origin/release/V3.3' into merge/APPS-112_setupSearchByDeclassificationReviewTest_no

Browse Source 
# Conflicts:
#	pom.xml
#	rm-automation/pom.xml
#	rm-automation/rm-automation-community-rest-api/pom.xml
#	rm-automation/rm-automation-enterprise-rest-api/pom.xml
#	rm-automation/rm-automation-ui/pom.xml
#	rm-benchmark/pom.xml
#	rm-community/pom.xml
#	rm-community/rm-community-repo/pom.xml
#	rm-community/rm-community-rest-api-explorer/pom.xml
#	rm-community/rm-community-share/pom.xml
#	rm-enterprise/pom.xml
#	rm-enterprise/rm-enterprise-repo/pom.xml
#	rm-enterprise/rm-enterprise-rest-api-explorer/pom.xml
#	rm-enterprise/rm-enterprise-share/pom.xml
This commit is contained in:
Claudia Agache
2020-05-11 12:48:47 +03:00
parent 0c6695d52d 4cf243ad1b
commit 94293d94fa
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>

7
rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/fileplancomponents/FilePlanComponentAspects.java
View File

@@ -41,10 +41,10 @@ public class FilePlanComponentAspects
// aspect present on completed records // aspect present on completed records
public static final String ASPECTS_COMPLETED_RECORD = "rma:declaredRecord"; public static final String ASPECTS_COMPLETED_RECORD = "rma:declaredRecord";
// aspect present on record folders/categories with vital records // aspect present on record folders/categories with vital records
public static final String ASPECTS_VITAL_RECORD_DEFINITION= "rma:vitalRecordDefinition"; public static final String ASPECTS_VITAL_RECORD_DEFINITION= "rma:vitalRecordDefinition";
// aspect present on vital records // aspect present on vital records
public static final String ASPECTS_VITAL_RECORD = "rma:vitalRecord"; public static final String ASPECTS_VITAL_RECORD = "rma:vitalRecord";
@@ -53,4 +53,7 @@ public class FilePlanComponentAspects
// recordSearch aspect // recordSearch aspect
public static final String RECORD_SEARCH_ASPECT = "rma:recordSearch"; public static final String RECORD_SEARCH_ASPECT = "rma:recordSearch";
// retention schedule cut off aspect
public static final String CUT_OFF_ASPECT = "rma:cutOff";
} }

3
rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/recordcategories/AutomaticDispositionTest.java
View File

@@ -26,6 +26,7 @@
*/ */
package org.alfresco.rest.rm.community.recordcategories; package org.alfresco.rest.rm.community.recordcategories;
import static org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponentAspects.CUT_OFF_ASPECT;
import static org.alfresco.utility.data.RandomData.getRandomName; import static org.alfresco.utility.data.RandomData.getRandomName;
import static org.alfresco.utility.report.log.Step.STEP; import static org.alfresco.utility.report.log.Step.STEP;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
@@ -45,8 +46,6 @@ import org.testng.annotations.Test;
public class AutomaticDispositionTest extends BaseRMRestTest public class AutomaticDispositionTest extends BaseRMRestTest
{ {
private static final String CUT_OFF_ASPECT = "rma:cutOff";
@Autowired @Autowired
private DispositionScheduleService dispositionScheduleService; private DispositionScheduleService dispositionScheduleService;