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 branch 'master' of https://gitlab.alfresco.com/records-management/records-management into RM-4396_UseModelInsteadJsonObject

Browse Source
This commit is contained in:
Rodica Sutu
2016-11-28 17:19:16 +02:00
parent 6482c51703 d7338fd991
commit 2c00b1aa22
4 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,6 +14,8 @@
<properties> <properties>
<alfresco.rm.share>alfresco-rm-community-share</alfresco.rm.share> <alfresco.rm.share>alfresco-rm-community-share</alfresco.rm.share>
<alfresco.rm.repo>alfresco-rm-community-repo</alfresco.rm.repo> <alfresco.rm.repo>alfresco-rm-community-repo</alfresco.rm.repo>
<tas.restapi.version>5.2.0-0</tas.restapi.version>
<fluent.json.version>2.0.0</fluent.json.version>
</properties> </properties>
<build> <build>
@@ -34,18 +36,18 @@
<dependency> <dependency>
<groupId>org.alfresco.tas</groupId> <groupId>org.alfresco.tas</groupId>
<artifactId>restapi-test</artifactId> <artifactId>restapi-test</artifactId>
<version>2.0.0</version> <version>${tas.restapi.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.alfresco.tas</groupId> <groupId>org.alfresco.tas</groupId>
<artifactId>restapi-test</artifactId> <artifactId>restapi-test</artifactId>
<version>2.0.0</version> <version>${tas.restapi.version}</version>
<type>test-jar</type> <type>test-jar</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jglue.fluent-json</groupId> <groupId>org.jglue.fluent-json</groupId>
<artifactId>fluent-json</artifactId> <artifactId>fluent-json</artifactId>
<version>2.0.0</version> <version>${fluent.json.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

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

@@ -61,7 +61,8 @@ import org.testng.annotations.BeforeClass;
* @since 2.6 * @since 2.6
*/ */
@Configuration @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) @PropertySource(value = "classpath:local.properties", ignoreResourceNotFound = true)
public class BaseRestTest extends RestTest public class BaseRestTest extends RestTest
{ {

2
rm-automation/rm-automation-community-rest-api/src/test/resources/config.properties Normal file
View File

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

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

@@ -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