Commit Graph

57 Commits

Author SHA1 Message Date
Alan Davis
6131de1c58 Merged 5.2.N (5.2.1) to HEAD (5.2)
127000 rneamtu: Update source headers - add new Copyrights for new Java files synced from Head (part 4).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-06-06 09:17:38 +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
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
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
f79e7be94d Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
123868 jkaabimofrad: RA-856: Added support for REST APIs “/content” endpoints to optionally set their own cache. (Currently, only the Renditions API is setting its own cache)
       - Removed the http attachment header setting from the AbstractResourceWebScript, as the ContentStreamer already has this feature
       - Reformatted ContentStreamer according to Alfresco code standards 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:24:48 +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
f5212b0c8c Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122967 jvonka: RA-766: Update REST fwk - implement "fields" (synonym for deprecated "properties") query param


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:18:59 +00:00
Jamal Kaabi-Mofrad
119a8acf4d Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122817 jvonka: (Quick) Shared Links API - retrieve rendition content (no auth required)
   - TODO add extra test
   RA-830


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126511 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:17:21 +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
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
6d8e8e5ecd Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122631 jkaabimofrad: RA-676: Added node's renditions REST API.
           - Download renditioned content + test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:11:15 +00:00
Jamal Kaabi-Mofrad
72dacb9c79 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122630 gjames: RA-211: Moving the response callback down a level


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:10:50 +00:00
Jamal Kaabi-Mofrad
5e0d82127d Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122629 gjames: RA-211: Adding a response callback for setting the response outside a transaction


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126487 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:10:32 +00:00
Jamal Kaabi-Mofrad
63b7a24c69 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122596 gjames: RA-211: Post-processing (carefully) embedded/related resources


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:09:54 +00:00
Jamal Kaabi-Mofrad
6e2fbe27e3 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122594 jvonka: REST api fwk: pass through query params for DELETE method
   - also update REST api test fwk
   RA-837


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:09:33 +00:00
Jamal Kaabi-Mofrad
7ae93de90a Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
122568 gjames: RA-211: Re-enabling binaryresource without post-processing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 11:08:58 +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
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
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
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
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
06f639f03d Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
121844 jvonka: Quick Share Link API - initial commit (work-in-progress)
   - demonstrate WebApiNoAuth
   - auth required to create &/or delete quick share link
   - no auth required to get &/or download content for a quick share link
   - TODO review detailed api & impl (+ add tests)
   RA-775, RA-773, RA-750, RA-708, RA-776


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126427 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:52:51 +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
7e62487fcb Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
120545 jvonka: FileFolder API - minor (fix formatting style - primarily opening curly brace on next line)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:38:36 +00:00
Jamal Kaabi-Mofrad
f8a7dcfd4d Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
120445 jvonka: RA-631, RA-641: REST fwk - fix GET node binary resource (set content-disposition/attachment header)
   - by default, set attachment header when downloading content
   - unless "attachment=false" *and* content type is in nonAttachContentTypes white list (eg. pdf, images)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126383 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:37:00 +00:00
Jamal Kaabi-Mofrad
2f84bce7f7 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
120441 jvonka: RA-727: REST fwk - fix GET node binary resource (setting of content info response headers)
   - including encoding (Content-Type charset) & locale (Content-Language)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:36:50 +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
744ca56709 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
119858 jvonka: RA-632: REST fwk - minor tweak to be consistent with existing exception handling


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:34:36 +00:00
Jamal Kaabi-Mofrad
04239107de Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
119775 jkaabimofrad: RA-635: Fixed Resource API fwk, where a resource is used to create a node via both JSON and multipart/form-data.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126365 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:32:47 +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
17012b17b6 Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
118692 jvonka: Merge from DEV/SABRE_JANV1 (part 2) - RA-613 / RA-655
   - File Folder API (PoC - experimental WIP)
   - TODO add tests +review backwards compat' (eg. favs)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126349 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-10 10:26:33 +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
Tatyana Valkevych
c70953278a Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
104025: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      103975: MNT-13938: Public API does not set any HTTP caching headers


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-05-13 16:25:31 +00:00
Alan Davis
6ae2064bfe Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)
99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      99482: Merged DEV to 5.0.N (5.0.1)
         99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project alfresco-jlan
         99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project alfresco-jlan
         99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project core
         99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project data-model
         99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project file-transfer-receiver
         99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project legacy-lucene
         99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project qa-share
         99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project remote-api
         99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters S..Z
         99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc in project Repository, letters A..R
         99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project share-po
         99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc typo in project slingshot
         99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project slingshot
         99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr
         99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr4
         99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project solr-client
         99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-client
         99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Changed Javadoc parameters inconsistence in project web-framework-commons


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-03-27 23:00:01 +00:00
Alan Davis
01aba183d1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
83757: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      << Bringing back the commit just reverted. Needed to revert another commit
         80358 which changed pom.xml files to include the correct versions of
   	  external libs including open cmiss 0.11 >>
      80966: Revere merged HEAD-BUG-FIX (5.0/Cloud)
         << Take out all OpenCMIS changes merged to HEAD-BUG-FIX that have come from V4.2-BUG-FIX >>
         80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
            << And added alfresco-opencmis-extension 1.0 >>
            79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
               << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128
                  rather than the changes from V4.2-BUG-FIX >>
               79166: Reverse merged V4.2-BUG-FIX (4.2.4)
                  << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                     and Steve is on holiday for a week. >>
                  << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
                  79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                     67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                        Updated OpenCMIS to 0.11 version.
                  79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                     79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
         80358: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            79166: Reverse merged V4.2-BUG-FIX (4.2.4)
               << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                  and Steve is on holiday for a week. >>
               << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
               79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                  67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                  Updated OpenCMIS to 0.11 version.
               79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                  79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
         80365: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80356: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               - Commit missed delete of old alfresco-opencmis-extension-0.9 sources/javadoc
         80366: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80337: MNT-11223 follow-up: bring back test dependencies in web-framework-commons pom, to make the Maven build pass again
         80814: MNT-11223: Fix build (pt1)
            - 80366: pom.xml contained a reference to an external surf which is now back in house.
         80858: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80373: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               - Found another reference to version 0.9 rather than 1.0 of alfresco-opencmis-extensions
         80861: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80397: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fixed TestCMIS.testMNT10430. Excluded sys:localized aspect from returned set in CMIS.
         80865: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80840: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fix for CMISTCKCRUD test. Added special handling of content stream file name property via accessor.
         80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Changed Solr to Lucene for tests.
      83745: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
         83699: ACE-484: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) VIA EOL
            81016: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Fixed TestCMIS to check for secondary types list to be null.
            81017: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            Disabled assert for tests run by maven.
            82255: Merged V4.2-BUG-FIX (4.2.4) to EOL (5.0/Cloud)
               82252: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               Disabled QueryRootFolderTest.
            - RECORD ONLY merge from V4.2-BUG-FIX extra commits not required on HEAD-BUG-FIX: 80373,80397,80840-80841,81707,81741,82245


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@84575 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-18 17:13:46 +00:00
Erik Winlof
22be126dec Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80966: Revere merged HEAD-BUG-FIX (5.0/Cloud)
      << Take out all OpenCMIS changes merged to HEAD-BUG-FIX that have come from V4.2-BUG-FIX >>
      80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
         << And added alfresco-opencmis-extension 1.0 >>
         79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
            << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128
               rather than the changes from V4.2-BUG-FIX >>
            79166: Reverse merged V4.2-BUG-FIX (4.2.4)
               << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
                  and Steve is on holiday for a week. >>
               << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
               79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
                  67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                     Updated OpenCMIS to 0.11 version.
               79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
                  79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
      80358: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         79166: Reverse merged V4.2-BUG-FIX (4.2.4)
            << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
               and Steve is on holiday for a week. >>
            << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
            79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
               67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
               Updated OpenCMIS to 0.11 version.
            79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
               79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades
      80365: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80356: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            - Commit missed delete of old alfresco-opencmis-extension-0.9 sources/javadoc
      80366: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80337: MNT-11223 follow-up: bring back test dependencies in web-framework-commons pom, to make the Maven build pass again
      80814: MNT-11223: Fix build (pt1)
         - 80366: pom.xml contained a reference to an external surf which is now back in house.
      80858: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80373: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
            - Found another reference to version 0.9 rather than 1.0 of alfresco-opencmis-extensions
      80861: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80397: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Fixed TestCMIS.testMNT10430. Excluded sys:localized aspect from returned set in CMIS.
      80865: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80840: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Fix for CMISTCKCRUD test. Added special handling of content stream file name property via accessor.
      80866: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         80841: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Changed Solr to Lucene for tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@83142 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-04 06:01:21 +00:00
Will Abson
f9a98f5466 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
80355: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
      << And added alfresco-opencmis-extension 1.0 >>
      79170: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
         << Commit is actually a reverse merge of the original merges from V4.2-BUG-FIX 79113,79128
            rather than the changes from V4.2-BUG-FIX >>
         79166: Reverse merged V4.2-BUG-FIX (4.2.4)
            << Need a new version of alfresco-opencmis-extension as 0.9 is incompatible with OpenCMIS 0.11.0
               and Steve is on holiday for a week. >>
            << The original commits are already merged to HBF for ACE-484 so will revert them too. >>
            79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
               67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
                  Updated OpenCMIS to 0.11 version.
            79120: MNT-11223: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.4) 
               79117: MNT-11596 Fix dependencies declared in pom files after upgrade of OpenCMIS to 0.11.0, and all related upgrades


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-09-03 15:29:34 +00:00