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

130295 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130039 gjames: SEARCH-159: Don't allow sort for cmis language


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130367 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java

@@ -192,6 +192,19 @@ public class SearchMapperTests
                     fail("Invalid sortDefinition");
             }
         });
+
+        searchParameters = new SearchParameters();
+        searchParameters.setLanguage(SearchMapper.CMIS);
+        try
+        {
+            searchMapper.fromSort(searchParameters, Arrays.asList(new SortDef("FIELD", null, false)));
+            fail();
+        }
+        catch (InvalidArgumentException iae)
+        {
+            //You can't specify SORT when using the CMIS language
+            assertNotNull(iae);
+        }
     }