inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
64426: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62536: Reverted Sites Public REST API changes, committed in r61735 and r62502. Also updated CloudSiteServiceImpl overlay to override isSiteAdmin method.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-03-15 01:40:20 +00:00
parent 25895187d8
commit b0add3b79a
4 changed files with 549 additions and 705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/test-java/org/alfresco/rest/api/tests/TestSites.java
View File

@@ -131,8 +131,7 @@ public class TestSites extends EnterpriseTestApi
}
catch(PublicApiException e)
{
// ACE-511: as we added Delete method, the status code needed to be changed from 405 (Method Not Allowed) to 404.
assertEquals(HttpStatus.SC_NOT_FOUND, e.getHttpResponse().getStatusCode());
assertEquals(HttpStatus.SC_METHOD_NOT_ALLOWED, e.getHttpResponse().getStatusCode());
}
// invalid site