Commit Graph

312 Commits

Author SHA1 Message Date
Ancuta Morarasu
6fddaa8eb1 Merged HEAD (5.2) to 5.2.N (5.2.1)
126393 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120645 jkaabimofrad: RA-638: Added test to GET node information.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 11:00:29 +00:00
Ancuta Morarasu
970b2ca96e Merged HEAD (5.2) to 5.2.N (5.2.1)
126386 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120471 jvonka: FileFolder API - NodeApiTest - follow-on to fix NPE in debug logging
      RA-641


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126732 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:56:59 +00:00
Ancuta Morarasu
7801810028 Merged HEAD (5.2) to 5.2.N (5.2.1)
126385 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120469 jvonka: FileFolder API - NodeApiTest - add test to retrieve content
      - also update test fwk to support post request body as byte array (as well as string)
      RA-641


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:56:47 +00:00
Ancuta Morarasu
08ac84ff25 Merged HEAD (5.2) to 5.2.N (5.2.1)
126384 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120464 jkaabimofrad: RA-725: Changed the "userName" property in minimal person response to "id".


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126730 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:56:17 +00:00
Ancuta Morarasu
45945b92a6 Merged HEAD (5.2) to 5.2.N (5.2.1)
126381 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120439 jvonka: RA-630: FileFolder API - update antlr grammar in REST fwk for select/where clause
      - to allow colon in property name identifier (json path)
      - also update impl + test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:54:46 +00:00
Ancuta Morarasu
5fbede5332 Merged HEAD (5.2) to 5.2.N (5.2.1)
126380 jkaabimofrad: 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/BRANCHES/DEV/5.2.N/root@126726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:53:26 +00:00
Ancuta Morarasu
79848e45da Merged HEAD (5.2) to 5.2.N (5.2.1)
126378 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      120059 jvonka: FileFolder API - NodeApiTest - add tests (+ve & -ve) to update node information
      RA-639


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126724 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:52:00 +00:00
Ancuta Morarasu
9ebe1f7c00 Merged HEAD (5.2) to 5.2.N (5.2.1)
126376 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119921 jkaabimofrad: Finished the requirements in RA-637. Added nodeType form data, the client provided content-type will be used if it is not null, and also support for model properties in the form data.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:51:44 +00:00
Ancuta Morarasu
49327679bb Merged HEAD (5.2) to 5.2.N (5.2.1)
126373 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119840 jvonka: FileFolder API - update NodeApiTest (testCreateFolder & testCreateEmptyFile)
      - follow pre-existing "expected" api test pattern


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:51:18 +00:00
Ancuta Morarasu
e97f9132ad Merged HEAD (5.2) to 5.2.N (5.2.1)
126372 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119837 jvonka: FileFolder API - fix build (BCK) & api tests
      - as agreed, for now split test client api models from server-side impl
      - rename existing Node/Document/Folder to FavouriteNode/Document/Folder (for backwards compat')


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126718 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:51:08 +00:00
Ancuta Morarasu
935c4cc5b0 Merged HEAD (5.2) to 5.2.N (5.2.1)
126370 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119801 jkaabimofrad: RA-637: Added autoRename form data for the multipart upload, so, on name clash, the API will try to auto­rename the file with an integer counter.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126715 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:49:47 +00:00
Ancuta Morarasu
f9a802acee Merged HEAD (5.2) to 5.2.N (5.2.1)
126369 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119798 jvonka: FileFolder API - NodeApiTest - add tests (+ve & -ve) to create empty file node
      - TODO subsequently show that file content can be updated
      RA-636


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126714 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:49:38 +00:00
Ancuta Morarasu
25141be821 Merged HEAD (5.2) to 5.2.N (5.2.1)
126368 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119796 jvonka: FileFolder API - NodeApiTest - add tests (+ve & -ve) for create folder
      RA-635


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126713 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:49:29 +00:00
Ancuta Morarasu
fda0be47c5 Merged HEAD (5.2) to 5.2.N (5.2.1)
126367 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119790 jvonka: FileFolder API - NodeApiTest - add test for delete node
      RA-642


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126712 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:49:19 +00:00
Ancuta Morarasu
0459a1bb6b Merged HEAD (5.2) to 5.2.N (5.2.1)
126362 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119730 jvonka: FileFolder API - NodeApiTest - fix check for path elements (null unless selected)
      -RA-638


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126708 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:48:17 +00:00
Ancuta Morarasu
78a2510b8d Merged HEAD (5.2) to 5.2.N (5.2.1)
126358 jkaabimofrad: 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/BRANCHES/DEV/5.2.N/root@126704 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:47:42 +00:00
Ancuta Morarasu
0b3aacf260 Merged HEAD (5.2) to 5.2.N (5.2.1)
126357 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119504 jkaabimofrad: RA-637, SFS-260: Added multipart upload REST API.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:47:32 +00:00
Ancuta Morarasu
f2c55e00af Merged HEAD (5.2) to 5.2.N (5.2.1)
126354 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119021 jkaabimofrad: Fixed test failure .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126700 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:47:04 +00:00
Ancuta Morarasu
b774ad0ac4 Merged HEAD (5.2) to 5.2.N (5.2.1)
126353 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      118880 jkaabimofrad: Fixed test failure .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:46:55 +00:00
Ancuta Morarasu
08f750ae65 Merged HEAD (5.2) to 5.2.N (5.2.1)
126352 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      118861 jkaabimofrad: Added NodeApiTest to test suit.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:46:47 +00:00
Ancuta Morarasu
d05f7bb484 Merged HEAD (5.2) to 5.2.N (5.2.1)
126351 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      118825 jkaabimofrad: RA-655: manual merge of SFS module to FILE-FOLDER-API.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-05-11 10:46:38 +00:00
Andreea Dragoi
15709360dd Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125817 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125673 abalmus: MNT-15421 : Intermittent failure SubsystemsTest.testAbstractPropertyBackedBean_performEarlyPropertyChecks_PortEarlyPropertyChecker
         - Fixed intermittently failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125859 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-27 12:22:40 +00:00
Raluca Munteanu
27333f1d39 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/BRANCHES/DEV/5.2.N/root@125788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:45:01 +00:00
Raluca Munteanu
386a4aca06 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/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 13:03:25 +00:00
Raluca Munteanu
9a889c69ea Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-04-26 12:48:49 +00:00
Raluca Munteanu
8fbfc61c54 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124493 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124467 amorarasu:       Reverse merged 5.0.N (5.0.4)
               124430 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
                  124322 adragoi: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
                     124254 amorarasu: MNT-15848: The PublishingRestApiTest.testPublishingQueuePost intermittently fails on SQL Server
                        - scheduled post publishing after 1500 milliseconds, to have time to test the SCHEDULED status.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124521 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-28 08:02:25 +00:00
Raluca Munteanu
cbad8bc789 Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
124488 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
      124430 aleahu:       124430 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
               124322 adragoi: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
                  124254 amorarasu: MNT-15848: The PublishingRestApiTest.testPublishingQueuePost intermittently fails on SQL Server
                     - scheduled post publishing after 1500 milliseconds, to have time to test the SCHEDULED status.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-28 08:00:08 +00:00
Alan Davis
d62ac8b95a Merged 5.1.N (5.1.1) to HEAD (5.2)
123428 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123346 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123048 rmunteanu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122964 rneamtu: MNT-15679: Delete comment updates the "Modifier" and "Modified date" properties of a file
               - Fixed failing test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123703 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:34:39 +00:00
Alan Davis
6da9f1acc7 Merged 5.1.N (5.1.1) to HEAD (5.2)
123426 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      123344 cturlica: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         123045 rmunteanu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122858 rneamtu: MNT-15679: Delete comment updates the "Modifier" and "Modified date" properties of a file
               - Java-backed webscript CommentDelete added
               - Auditable behavior is disabled around deleting comment-node
               - Added unit test for case: CommentsApiTest.testDeleteCommentDoesNotChangeModifiedDate


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123701 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:34:24 +00:00
Alan Davis
b11b750d29 Merged 5.1.N (5.1.1) to HEAD (5.2)
122555 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      122499 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
         122438 rneamtu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
            122396 amorarasu: MNT-13739: Site consumers are able to lock documents (they did not create) via WebDAV
               - Fixed failing tests + added a test for moving locked nodes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123677 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:31:16 +00:00
Alan Davis
7bcccda334 Merged 5.1.N (5.1.1) to HEAD (5.2)
122427 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      122412 nsmintanca: MNT-15642 CLONE - Request to join a moderated site multiple times
         -added validation on backend to prevent multiple requests for joining a site
         -updated unit tests
         -added widget to display "Cancel request" button


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 22:25:47 +00:00
Alan Davis
1ca60fc47a Merged 5.1.N (5.1.1) to HEAD (5.1)
121627 rmunteanu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      121496 arebegea: MNT-14409 : Unable to configure search filter for TAG/SITE via extension
         - Modified the SolrFacetConfig QName resolver to use the FacetQNameUtils that was also used when added a filter from Share
         - Had to move the FacetQNameUtils and the test class FacetQNameUtilsTest to repository project
         - Added the FacetQNameUtilsTest test to the AllUnitTestsSuite


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123645 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:42:09 +00:00
Alan Davis
2fc7b70449 Merged 5.1.N (5.1.1) to HEAD (5.1)
120777 aleahu: MNT-15480 : Intermittent failure  WebDAVMethodTest.expiryLockTest()
      - Increased timeout


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123629 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:39:56 +00:00
Alan Davis
98a4e139b4 Merged 5.1.N (5.1.1) to HEAD (5.1)
120594 cturlica: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120538 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:35 +00:00
Alan Davis
33bb9e3ad3 Merged 5.1.N (5.1.1) to HEAD (5.1)
120443 arebegea: Revert Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123622 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:10 +00:00
Alan Davis
d3d2a6612a Merged 5.1.N (5.1.1) to HEAD (5.1)
120429 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123621 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:36:00 +00:00
Alan Davis
de829cb701 Merged 5.1.N (5.1.1) to HEAD (5.1)
120428 arebegea: Revert Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:51 +00:00
Alan Davis
21549b96bc Merged 5.1.N (5.1.1) to HEAD (5.1)
120414 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120386 abozianu: Merged DEV to 5.0.N (5.0.4)
         120352 abozianu: MNT-14411 : Re-created user can't cancel created task
            - fix and unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:42 +00:00
Alan Davis
58efe344c2 Merged 5.1.N (5.1.1) to HEAD (5.1)
120413 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120350 aleahu: MNT-14845 : Site Export Rest API creates a corrupted ZIP if the site contains members synced from LDAP
         - Fixed by not exporting user node if it doesn't exist
         - Added unit tests for site export


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 21:35:34 +00:00
Alan Davis
021911fad0 Merged 5.1.N (5.1.1) to HEAD (5.1)
118424 cturlica: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      118394 amukha: Merged 5.0.1 (5.0.1.14) to 5.0.N (5.0.4)
         117907 abalmus: MNT-14631 : REST Processes and Tasks API for parameters/variables allowed MATCHES operator, operator is not case-insensitive
            - Fix on Alfresco side, test and updated pom.xml to use new Activiti jar


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123593 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:30:06 +00:00
Alan Davis
0e0e903b61 Merged 5.1.N (5.1.1) to HEAD (5.1)
117597 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
      117582 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
         116652 amorarasu: MNT-14983: CMIS: Euro character not encoded correctly
            Merged V4.2.4 (4.2.4.19) to V4.2-BUG-FIX (4.2.6)
               115140 115998 116396 amorarasu: MNT-15044: CLONE - CMIS: Euro character not encoded correctly
                  - Removed the unicode interval that was used to escape characters from the categories: currency, general punctuation, subscripts and superscripts (2000-20FF).
                  - Changed the way the control characters are filtered + adapted tests.
                  - Removed unnecessary j_string use from the ftl and added proper xml encoding.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-03-11 17:27:03 +00:00
Tatyana Valkevych
74897b5af4 ACE-5040: Merged 5.1.N (5.1.1) to HEAD (5.1)
120106 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120071 rmunteanu: Merged 5.0.3 (5.0.3) to 5.0.N (5.0.4)
         119848 adragoi: Merged DEV to 5.0.3 (5.0.3)
            119808 adragoi: MNT-15338 : CMIS get object by path only shows the working copy file and not the original file
               - reverted commits related to "Ghost versions when Document is created with CheckinType CHECKOUT" stask :  
               100772 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100260: MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Fix for tests failures
               100824 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                     100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                        99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Don't include PWC in a version series
                        99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                           - Return PWC as a part of version series. Fixes to pass TCK
               100837 : Fix another merge issue as a result of a re factor that has taken place in 5.0
                  Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                     100184: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
                        100131 : Merged DEV to V4.1-BUG-FIX (4.1.10)
                           99521 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                              - Don't include PWC in a version series
                           99824 : MNT-9088 : Ghost versions when Document is created with CheckinType CHECKOUT
                              - Return PWC as a part of version series. Fixes to pass TCK
               101404 : Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
                  101273: Merged DEV to V4.2-GUB-FIX (4.2.5)
                     100792 : MNT-13722 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                        - Added init-method for CMISConnector. Test is added
               101597 : Merged DEV to 5.0.N (5.0.2)
                  101560 : MNT-13813 : CLONE - Ghost versions when Document is created with CheckinType CHECKOUT
                     - Fix to test failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@121388 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2016-01-25 12:16:13 +00:00
Jean-Pierre Huynh
f8fa061ba3 Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119558 gcornwell: Merged code coverage improvements to 5.1-MC1 (5.1.0)
      r117774 gjames: RA-567: Increase /workflow/processes API code coverage
      r117773 gjames: RA-567: /workflow/processes coverage, removed unused ActivitiTypeConverter
      r116883 gjames: RA-531: reapplied change after merge, for MultiTServiceImpl test coverage
      r116629 gjames: RA-568 Increase /workflow/process-definitions API code coverage
      r116574 gjames: RA-569 Increase /workflow/tasks API code coverage
      r116286 gjames: RA-567: Increase /workflow/processes API code coverage
      r115853 gjames: RA-566: Increasing /people api coverage (description field)
      r115811 gjames: RA-566: Increasing /people api coverage
      r113007 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DynamicNamespacePrefixResolver RA-521
      r113006 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DictionaryComponent RA-514
      r112969 gjames: Adding additional test coverage for TemplateServiceImpl RA-530
      r112960 gjames: Alternative test approach for ModuleServiceImpl RA-520
      r112703 gjames: Adding additional test coverage for NodeLocatorService RA-522
      r112702 gjames: Adding additional test coverage for JobLockServiceImpl RA-516
      r112699 gjames: Adding additional test coverage for ModuleServiceImpl RA-520
      r112508 gjames: Adding additional test coverage for RenditionServiceImpl RA-526
      r112476 gjames: Adding additional test coverage for ContentServiceImpl RA-513
      r112475 gjames: Adding additional test coverage for MimetypeMap RA-519
      r112238 gjames: Adding additional test coverage for MimetypeMap RA-519
      r112237 gjames: Adding additional test coverage for TaggingService RA-529
      r112236 gjames: Adding additional test coverage for MultiTServiceImpl RA-531
      r112206 gjames: Adding additional test coverage for ContentServiceImpl RA-513
      r112167 gcornwell: RA-523: Increase NodeService code coverage (removed redundant code that was testing a version store we no longer use)
      r112102 gjames: Reverted changes to PermissionServiceImpl for RA-524
      r112048 gjames: Temporarily removed some PermissionServiceImpl code. I need to put it back.
      r111620 gjames: Adding additional test coverage for PermissionService RA-524
      r111619 gjames: Added some @Override to make Sonar happier
      r111456 gjames: Adding additional test coverage for AuthenticationService RA-509
      r111427 gjames: Adding additional test coverage for AttributeService RA-509
      r111317 gjames: Adding additional test coverage for WorkflowService RA-533


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:35:05 +00:00
Jean-Pierre Huynh
921dbb04ae Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
119082 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118568 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         118398 gjames: RA-607 BCRYPT Improved the logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-10 10:17:10 +00:00
Jamal Kaabi-Mofrad
6f569467af ACE-4823: Fixed "list of a person's site memberships" REST API which only returned one of the two sites with identical titles.
- Also, fixed code standards.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119747 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-12-07 18:29:10 +00:00
Tom Page
ee8bd08296 ACE-4766 Fix intermittent unit test.
Previous fix for this issue changed the unit test to be consistent with the
alfresco-text-gen library, so that they both counted characters. Actually both
should count bytes. Fix the library to count bytes, update the dependency and
revert the change to the testLoad_15_default unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118819 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-30 08:51:28 +00:00
Tom Page
98db032925 ACE-4766 Fix intermittent unit test by verifying number of characters.
Previously we were verifying the number of bytes, which failed for strings
containing non-ASCII characters (such as £).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@118737 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-27 10:13:18 +00:00
Gethin James
9421091283 ACE-4578 Workflow ProcessDefinitions Public Api doesn't use orderBy, fixed and added tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@116443 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-11-06 15:30:31 +00:00
Alan Davis
4b2179865b Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115549 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      112033: Merged 5.0.N (5.0.3) to 5.1.N (5.1.0)
         111936: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            111829: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111784: Merged DEV to V4.2.5 (4.2.5)
                  111783: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - Extended QueryLikeTest in order to create test data folder with temporary aspect.,
      112919: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         112547 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            112542: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               111974: Merged DEV to V4.2.5 (4.2.5)
                  111967: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - skipped deletion of test data,
      114016: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         113902 amorarasu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            113818 abozianu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               113605 adragoi: Merged DEV to V4.2.5 (4.2.5)
                  113579: MNT-14432 : DB TestPublicAp*TCK failures on DB2, MariaDB, Oracle & SQL Server
                     - skip deletion for test data for QueryForObject and QueryInFolderTest 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115686 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:16:17 +00:00
Alan Davis
114566a80e Merged 5.1-MNT1 (5.1.0) to HEAD (5.1)
115475 adavis: Merged 5.1.N (5.1.1) to 5.1-MNT1 (5.1.0)
      114837 rmunteanu: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         114758 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
            114713 amorarasu: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
               114616 abozianu: MNT-14994: CLONE - Alfresco Mobile: All Sites is throwing error when listing sites
                  - added unit tests
                  - ran all test cases in a single test to improve the testing time by using the same test data


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@115684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2015-10-30 00:16:00 +00:00