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 5.2.0 (5.2.0) to HEAD (5.2)

Browse Source 
134764 mmuller: Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
      134751 mmuller: 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/HEAD/root@134985 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2017-02-07 15:07:35 +00:00
parent b6c4e45a3f
commit 3c3021c1f8
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/opencmis/CMISHttpServletRequest.java
View File

@@ -484,8 +484,6 @@ public class CMISHttpServletRequest implements HttpServletRequest
queryString.append("&repositoryId="); queryString.append("&repositoryId=");
queryString.append(networkId); queryString.append(networkId);
} }
queryString.append("&cmisselector=");
queryString.append(Constants.SELECTOR_REPOSITORY_INFO);
return queryString.toString(); return queryString.toString();
} }

21
source/test-java/org/alfresco/rest/api/tests/TestCMIS.java
View File

@@ -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.CmisObjectNotFoundException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisPermissionDeniedException; import org.apache.chemistry.opencmis.commons.exceptions.CmisPermissionDeniedException;
import org.apache.chemistry.opencmis.commons.exceptions.CmisUpdateConflictException; 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.chemistry.opencmis.commons.impl.dataobjects.ContentStreamImpl;
import org.apache.commons.httpclient.HttpStatus; import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.io.IOUtils; 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<String> 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. * Tests OpenCMIS api.
*/ */