Commit Graph

53 Commits

Author SHA1 Message Date
Alan Davis
07fe704500 Merged 5.2.N (5.2.1) to HEAD (5.2)
130610 amorarasu: REPO-484: [REST API] 400 error for unsupported NOT operator in the 'where' predicate.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132152 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-11-03 13:12:44 +00:00
Alan Davis
bdca31ff6a Merged 5.2.N (5.2.1) to HEAD (5.2)
130289 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130028 gjames: SEARCH-120: Moving SearchContext and facets to its own package


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 22:09:16 +00:00
Alan Davis
c80a95d755 Merged 5.2.N (5.2.1) to HEAD (5.2)
130288 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      130027 gjames: SEARCH-120: Implementing facet queries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130360 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 22:09:06 +00:00
Alan Davis
a0a62612f4 Merged 5.2.N (5.2.1) to HEAD (5.2)
130178 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129808 gjames: SEARCH-112: Adding SearchContext to the response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 22:04:24 +00:00
Alan Davis
c6dda1e7fa Merged 5.2.N (5.2.1) to HEAD (5.2)
130165 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129774 gjames: SEARCH-113: Moving more api logic to helper classes, using a "trait" style


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-09-06 22:02:33 +00:00
Alan Davis
9818f16f2a Merged 5.2.N (5.2.1) to HEAD (5.2)
126998 amorarasu: Update source headers - add new Copyrights for new Java files synced from Head (part 3).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:17:00 +00:00
Alan Davis
3e1e1edbaa Merged 5.2.N (5.2.1) to HEAD (5.2)
125788 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125606 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125515 slanglois: MNT-16155 Update source headers - add new Copyrights for Java and JSP source files + automatic check in the build


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127810 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 17:08:06 +00:00
Alan Davis
19fcf2c411 Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-03 16:45:04 +00:00
Jamal Kaabi-Mofrad
d5cb47936f Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
127226 gjames: RA-1064: Added a WebScriptExceptionResolver


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 22:16:49 +00:00
Jamal Kaabi-Mofrad
f17a4d19cf Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
126242 gjames: RA-878:All api errors should return the standard error object


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 21:40:03 +00:00
Jamal Kaabi-Mofrad
f9eb72c7ef Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
125761 gjames: RA-652: new stack trace message and logId property


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 21:38:35 +00:00
Jamal Kaabi-Mofrad
46c3f3eb30 Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
125552 gjames: RA-652: Stack traces not returned, but in the log, only for 500 or debugging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 21:19:27 +00:00
Jamal Kaabi-Mofrad
9472ad7d30 Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
125551 gjames: RA-652: Stack traces not returned, but in the log.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-02 21:19:20 +00:00
Jamal Kaabi-Mofrad
186236813e Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
125121 gjames: RA-675: Fixed the descriptionURL in error response


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126609 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:49:57 +00:00
Jamal Kaabi-Mofrad
c2cb1eec77 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124822 jkaabimofrad: RA-889: Fixed test failure as the result of my r124813 commit.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:43:22 +00:00
Jamal Kaabi-Mofrad
840fd93569 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
124208 gjames: RA-892: Improved the error message handling


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126554 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:27:59 +00:00
Jamal Kaabi-Mofrad
d9144eb712 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
123214 gjames: RA-812: Changed http 400 to 404


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:23:22 +00:00
Jamal Kaabi-Mofrad
1e4f80cb61 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
123025 gjames: RA-757: Handle integrity exceptions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126522 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:19:41 +00:00
Jamal Kaabi-Mofrad
a2541568a8 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122978 jvonka: RA-766: Update REST fwk - implement "include" query param (used by nodes & shared-links) and deprecate "select" (still used by tasks & cmm).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126520 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:19:16 +00:00
Jamal Kaabi-Mofrad
f5fb4fbbb5 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122952 gjames: RA-211: test for custom caching


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126517 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:18:44 +00:00
Jamal Kaabi-Mofrad
23a41c1dc6 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122951 gjames: RA-827: test for 202


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:18:33 +00:00
Jamal Kaabi-Mofrad
bb9995a536 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122762 gjames: RA-211: Improving the test coverage of WithResponse


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126505 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:14:35 +00:00
Jamal Kaabi-Mofrad
dfdba82274 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122759 gjames: RA-211: Changing execution actions to handle WithResponse. Rework>Java7


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126504 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:14:27 +00:00
Jamal Kaabi-Mofrad
0b96a584c7 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122757 gjames: RA-211: Updated the javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:13:50 +00:00
Jamal Kaabi-Mofrad
6bec9bb1b8 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122700 gjames: RA-211: Response header handling


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126496 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:12:45 +00:00
Jamal Kaabi-Mofrad
691d4999b7 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122640 gjames: RA-211: Renamed ResponseCallBack to WithResponse (because its not a callback)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126493 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:12:05 +00:00
Jamal Kaabi-Mofrad
81d364f4e4 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122636 gjames: RA-211: Adding the ResponseCallBack to the Multipart actions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126490 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:11:27 +00:00
Jamal Kaabi-Mofrad
1da6179926 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122547 gjames: RA-823:  Allow the implementation to specify the "source entity" first.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126479 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:08:46 +00:00
Jamal Kaabi-Mofrad
e3068608bc Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122543 gjames: RA-211: Moving around execution logic in preparation for more flexible respoonse handling


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126478 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:08:37 +00:00
Jamal Kaabi-Mofrad
e1e80ff823 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122518 gjames: RA-211: Added the webscriptrequest to the Params interface


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:08:24 +00:00
Jamal Kaabi-Mofrad
748cf5a840 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122419 gjames: RA-827 More testing of custom status codes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:06:05 +00:00
Jamal Kaabi-Mofrad
c03efd351c Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122418 gjames: RA-827 Supporting custom status codes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:05:56 +00:00
Jamal Kaabi-Mofrad
64910d2d77 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122317 gjames: Adding more test coverage of the webscript executors


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:04:11 +00:00
Jamal Kaabi-Mofrad
52ef5d5374 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122276 gjames: Improving the test coverage of webscriptGet


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:04:04 +00:00
Jamal Kaabi-Mofrad
f7f489f349 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122275 gjames: Improving the tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126463 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:03:58 +00:00
Jamal Kaabi-Mofrad
7d99e1aa4a Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122241 gjames: RA-833: Added a RelationshipResourceBinaryAction


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126462 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:03:52 +00:00
Jamal Kaabi-Mofrad
05757c9773 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122240 gjames: RA-833: Initial framework changes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126461 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:03:39 +00:00
Jamal Kaabi-Mofrad
fd7690b5c7 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122167 gjames: RA-823 adding "source" into the collection output


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126455 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:57:58 +00:00
Jamal Kaabi-Mofrad
c35f8c0a24 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122166 gjames: Changed the method name because Jan didn't like it.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126454 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:57:50 +00:00
Jamal Kaabi-Mofrad
3b6cad99e6 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122164 gjames: RA-823 adding "includeSource" param


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126452 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:57:28 +00:00
Jamal Kaabi-Mofrad
bd65bbf529 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
121907 gjames: RA-774 Renaming action to operation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126435 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:54:32 +00:00
Jamal Kaabi-Mofrad
e025be9f98 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
121865 gjames: RA-774 Unit test handled Throwable


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126430 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:53:34 +00:00
Jamal Kaabi-Mofrad
7c27b2070f Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
121864 gjames: RA-774 Allow the use of "Void" parameter type


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126429 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:53:24 +00:00
Jamal Kaabi-Mofrad
3a6d18ba6a Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
121808 gjames: RA-774 Improving action tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126421 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:51:36 +00:00
Jamal Kaabi-Mofrad
6e0f375fb5 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
121807 gjames: RA-774 Added basic action support


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126420 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:51:25 +00:00
Jamal Kaabi-Mofrad
5474d0a70f Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
121614 jvonka: REST fwk - allow select clause properties to take precedence (ie. be included) when using properties 'filter'
   - eg. select=abc,def&properties=id,name, ghi ... should return all five (not just id,name,ghi)
   RA-739


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:50:07 +00:00
Jamal Kaabi-Mofrad
9ec0c640f3 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
120084 jkaabimofrad: RA-640, RA-681: made "update node content" API to return the default JSON representation of the file node. Also added a test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126380 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:36:18 +00:00
Jamal Kaabi-Mofrad
0b75a49b73 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
119623 jvonka: RA-663: Update REST fwk - fix BinaryResource update (currently masks entity PUT operation)
   - use "updateProperty" (instead of "update") to be consistent with other binary resource methods
   - note: REST fwk relies on unique method names across the resource actions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:30:30 +00:00
Jamal Kaabi-Mofrad
8855ef66f8 ACE-4469: Merged BRANCHES/DEV/HEAD-SFS (cherry picked) to HEAD
113520: SFS-179: Added multipart upload support into Public API framework.
   114561: SFS-179: Added tests for upload API, as well as minor fixes.
   114732: SFS-179: Changed the assert import from 3.X to 4.X.
   114734: SFS-179: Added unit tests for Public API framework multiPart support.
   114735: SFS-179: Fixed unit test failure.
- Also removed mergeinfo added in r112639

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@114736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-19 23:25:59 +00:00
Tatyana Valkevych
22d2935235 Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-07-02 16:13:03 +00:00