inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-09-17 14:21:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #510 from Alfresco/sdk-4/acs-endpoint-property

Browse Source 
Look for custom java system property for alfresco location
This commit is contained in:
Ole Hejlskov
2018-12-18 12:47:07 +01:00
committed by GitHub
parent 3873d2907e 42a4805d93
commit 5a35c948ca
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/alfresco-rad/src/main/java/org/alfresco/rad/test/AlfrescoTestRunner.java
View File

@@ -19,6 +19,7 @@ package org.alfresco.rad.test;
import org.alfresco.rad.SpringContextHolder; import org.alfresco.rad.SpringContextHolder;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScope; import org.apache.http.auth.AuthScope;
import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.auth.UsernamePasswordCredentials;
@@ -66,6 +67,9 @@ import java.io.*;
* @since 3.0 * @since 3.0
*/ */
public class AlfrescoTestRunner extends BlockJUnit4ClassRunner { public class AlfrescoTestRunner extends BlockJUnit4ClassRunner {
private static final String ACS_ENDPOINT_PROP = "acs.endpoint.path";
private static final String ACS_DEFAULT_ENDPOINT = "http://localhost:8080/alfresco";
public static final String SUCCESS = "SUCCESS"; public static final String SUCCESS = "SUCCESS";
public static final String FAILURE = "FAILURE"; public static final String FAILURE = "FAILURE";
@@ -230,7 +234,9 @@ public class AlfrescoTestRunner extends BlockJUnit4ClassRunner {
/** /**
* Check the @Remote config on the test class to see where the * Check the @Remote config on the test class to see where the
* Alfresco Repo is running * Alfresco Repo is running. If it is not present, check the
* ACS_ENDPOINT_PROP system property as an alternative location.
* If none of them has a value, then return the default location.
* *
* @param method * @param method
* @return * @return
@@ -243,7 +249,8 @@ public class AlfrescoTestRunner extends BlockJUnit4ClassRunner {
return annotation.endpoint(); return annotation.endpoint();
} }
return "http://localhost:8080/alfresco"; final String platformEndpoint = System.getProperty(ACS_ENDPOINT_PROP);
return StringUtils.isNotBlank(platformEndpoint) ? platformEndpoint : ACS_DEFAULT_ENDPOINT;
} }
} }