Merged searchapi (5.2.1) to 5.2.N (5.2.1)

129999 ahind: Merged 5.2.N-AHIND (5.2.1) to searchapi (5.2.1)
      129643 amorarasu: REPO-164 / REPO-1086 - V1 REST API: Lock Node


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2016-09-06 14:58:13 +00:00
parent 0029357fa1
commit 91cc53e31b
4 changed files with 86 additions and 85 deletions

View File

@@ -86,6 +86,7 @@ import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.util.GUID;
import org.alfresco.util.TempFileProvider;
import org.apache.http.HttpStatus;
import org.json.simple.JSONObject;
import org.junit.After;
import org.junit.Before;