From f48c4b5cda052d32dc90cb41044ee34152014128 Mon Sep 17 00:00:00 2001 From: Martin Muller Date: Wed, 25 Jan 2017 12:55:08 +0000 Subject: [PATCH] Merged 5.2.N-REPO-1815 (5.2.1) to 5.2.N (5.2.1) 134745 mmuller: REPO-1815 / ACE-5753 reverse cmisselector=repositoryInfo + regression test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../opencmis/CMISHttpServletRequest.java | 2 -- .../org/alfresco/rest/api/tests/TestCMIS.java | 21 +++++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/opencmis/CMISHttpServletRequest.java b/source/java/org/alfresco/opencmis/CMISHttpServletRequest.java index 68d80dfebd..13482e8697 100644 --- a/source/java/org/alfresco/opencmis/CMISHttpServletRequest.java +++ b/source/java/org/alfresco/opencmis/CMISHttpServletRequest.java @@ -484,8 +484,6 @@ public class CMISHttpServletRequest implements HttpServletRequest queryString.append("&repositoryId="); queryString.append(networkId); } - queryString.append("&cmisselector="); - queryString.append(Constants.SELECTOR_REPOSITORY_INFO); return queryString.toString(); } diff --git a/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java b/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java index cc2bafce37..cb7db0ab5e 100644 --- a/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java +++ b/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java @@ -130,6 +130,7 @@ import org.apache.chemistry.opencmis.commons.exceptions.CmisInvalidArgumentExcep import org.apache.chemistry.opencmis.commons.exceptions.CmisObjectNotFoundException; import org.apache.chemistry.opencmis.commons.exceptions.CmisPermissionDeniedException; import org.apache.chemistry.opencmis.commons.exceptions.CmisUpdateConflictException; +import org.apache.chemistry.opencmis.commons.impl.Constants; import org.apache.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl; import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.io.IOUtils; @@ -221,6 +222,26 @@ public class TestCMIS extends EnterpriseTestApi } } + /** + * ACE-5753 / REPO-1815 Check the return from http://localhost:8080/alfresco/api/-default-/public/cmis/versions/1.1/browser/root + * @throws Exception + */ + @Test + public void testBrowserBindingRoot() throws Exception + { + final TestNetwork network1 = getTestFixture().getRandomNetwork(); + Iterator personIt = network1.getPersonIds().iterator(); + final String personId = personIt.next(); + assertNotNull(personId); + Person person = repoService.getPerson(personId); + assertNotNull(person); + + publicApiClient.setRequestContext(new RequestContext(network1.getId(), personId)); + + HttpResponse response = publicApiClient.get(network1.getId() + "/public/cmis/versions/1.1/browser/root", null); + assertEquals(200, response.getStatusCode()); + } + /** * Tests OpenCMIS api. */