Merge branch 'master' of https://gitlab.alfresco.com/records-management/records-management into RM-4396_UseModelInsteadJsonObject

rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java

@@ -61,7 +61,8 @@ import org.testng.annotations.BeforeClass;
  * @since 2.6
  */
 @Configuration
-@PropertySource("classpath:default.properties")
+@PropertySource(value = {"classpath:default.properties", "classpath:config.properties"})
+@PropertySource(value = "classpath:module.properties", ignoreResourceNotFound = true)
 @PropertySource(value = "classpath:local.properties", ignoreResourceNotFound = true)
 public class BaseRestTest extends RestTest
 {

rm-automation/rm-automation-community-rest-api/src/test/resources/config.properties

@@ -0,0 +1,2 @@
+alfresco.server=localhost
+rest.rmPath=alfresco/api/-default-/public/ig/versions/1

rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties

@@ -1,25 +0,0 @@
-#########################################################################
-#           Original property values from default.properties            #
-#########################################################################
-
-# Dataprep related
-alfresco.scheme=http
-alfresco.server=localhost
-alfresco.port=8080
-
-# Credentials
-admin.user=admin
-admin.password=admin
-
-# Rest related
-rest.basePath=alfresco/api/-default-/public/alfresco/versions/1
-rest.workflowPath=alfresco/api/-default-/public/workflow/versions/1
-
-# Database Section
-db.url = jdbc:mysql://${alfresco.server}:3306/alfresco
-db.username = alfresco
-db.password = alfresco
-
-#########################################################################
-
-rest.rmPath=alfresco/api/-default-/public/ig/versions/1