From af1ba799f8205afcbaf6f2fed6413a83cdae02ae Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Fri, 25 Nov 2016 23:32:32 +0000
Subject: [PATCH] RM-4309 (Investigate an alternative option for the
 default.properties in RM REST API Automation project)

---
 .../rest/rm/community/base/BaseRestTest.java  |  3 ++-
 .../src/test/resources/config.properties      |  2 ++
 .../src/test/resources/default.properties     | 25 -------------------
 3 files changed, 4 insertions(+), 26 deletions(-)
 create mode 100644 rm-automation/rm-automation-community-rest-api/src/test/resources/config.properties
 delete mode 100644 rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties

diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java
index 1006b79e52..1b975ea750 100644
--- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java
+++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java
@@ -68,7 +68,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
 {
diff --git a/rm-automation/rm-automation-community-rest-api/src/test/resources/config.properties b/rm-automation/rm-automation-community-rest-api/src/test/resources/config.properties
new file mode 100644
index 0000000000..e376e2c0d3
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties b/rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties
deleted file mode 100644
index 911f2a44fc..0000000000
--- a/rm-automation/rm-automation-community-rest-api/src/test/resources/default.properties
+++ /dev/null
@@ -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
\ No newline at end of file