120259 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120179 amorarasu: Merged DEV to 5.0.N (5.0.4)
120074 nabacioaiei: MNT-15252 : Any repository amp having set module.repo.version.min=5.0.2.1 cannot be applied to an Alfresco One 5.0.2.1 instance.
- modified ModuleDetailsImpl to ignore version.label(if it exists) from module.repo.version.min and module.repo.version.max and log a warning.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120109 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120046 abozianu: Merged DEV to 5.0.N (5.0.4)
117528 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
- added a new aspect for cmis checked out documents : ASPECT_CMIS_CHECKEDOUT
118441 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
- changed aspect name from ASPECT_CMIS_CHECKEDOUT to ASPECT_CMIS_CREATED_CHECKEDOUT
118775 abozianu: MNT-14687 : Creating a document as checkedout and then cancelling the checkout should delete the document
- fixed commit error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123614 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120108 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120075 rmunteanu: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
120039 amukha: Merged V4.2-BUG-FIX-MNT-14688 (4.2.6) to V4.2-BUG-FIX (4.2.6)
120019 amukha: MNT-14688: version revert on first version failure if type has aspect
- Restoring a version now restores the node's type.
- Added JUnit test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120102 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120042 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
119705 gjames: MNT-15211 Restoring data from Trashcan with MySQL Cluster NDB backend doesn't work
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123608 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120101 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
120041 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
119608 gjames: MNT-15211 Restoring data from Trashcan with MySQL Cluster NDB backend doesn't work
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123607 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
118308 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118237 aleahu: MNT-14853 : Unable to download zip with non primary child
- Fixed spacing by removing tabs as per Derek's request.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
118307 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118231 aleahu: MNT-14853 : Unable to download zip with non primary child
- Added the flag exportSecondaryNodes for the ExporterComponent, and if this is set on true we export the secondary nodes as actual nodes.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
118306 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118229 aleahu: MNT-14730 : Approve and Reject workflow not working in subfolders after the rule has been applied
- Renamed the copied file when executing a simple workflow rule in order to avoid name conflicts by using copyAndRename instead of copy.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
117930 rneamtu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
117707 aleahu: MNT-14341 : FTP authentication fails when External authentication is enabled
- Checked that the instance of the authenticator used is not the same as the one from which the call is made
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
113586 tvalkevych: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113508 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113395 tvalkevych: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
113371 amorarasu: Merged DEV to V4.1-BUG-FIX (4.1.11)
113345: MNT-10305: DeletedNodeCleanupWorker should be improved.
- Fixed the starting time for the purge old nodes process.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123579 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
113398 tvalkevych: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113291 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113279 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
113102 amorarasu: MNT-10305: DeletedNodeCleanupWorker should be improved.
- Moved the retrying transaction helper declaration back in the while loop - fix test attempt.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123577 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
113397 tvalkevych: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
113290 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
113278 adavis: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
112985 amorarasu: Merged DEV to V4.1-BUG-FIX (4.1.11)
111742: MNT-10305: DeletedNodeCleanupWorker should be improved
- Delete in multiple statements, filtering by transactions with commit time in a time interval.
112722: Improved the algorithm that sets appropriate time windows for delete, based on the evolution of the purge process.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Merges from 5.1.0 (when it was 5.1) that did not make it to HEAD:
122506,122513,123118-123119
- RECORD ONLY Merges from HEAD: 119613-119617,119622,119706-119708,
119752-119753,120076-120078,120116,120166-120178,120182-120183,
120185-120193,120197-120201,120378-120385,120387,120431,120526,
120604-120625,120832-120842,120844-120849,120977-120982,121142-121144,
121313,121347-121348,121410,121412-121417,121684-121687,121802-121805,
121810-121815,121861,122287,122342,122361,122439-122441,122579,122921
- RECORD ONLY merges: 119602,119821-119822,119849,120065,120107,
120159,120260,120295,120339,120342,120371,120411-120412,120524,120527,
120696-120697,120705,120720,120746,120761,120819,120822,120893,
120935-120936,120993,121045,121119,121121,121132,121156-121157,
121299,121301,121309,121394,121408,121442,121481,121624,121626,
121672,121675,121692,121753,121795,121798,121852,121898,121981,
122030,122088,122114,122142,122213,122215,122217,122277,122340,
122343,122426,122487,122552,122554,122607,122654,122734,122861,
122906,122982,122985,122988,122996,123014,123031,123090,
123115-123117,123120
- Merge from 5.1.N of fix that should have gone into 5.1 (found because of conflict on merge)
123128: ACE-5155 Garbled message in patch-service.properties
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
122540 adragoi: Merged DEV to HEAD (5.1)
122252 ACE-5093 : Allow file content URLs to be generated by a provider
- implemented TimeBasedFileContentUrlProvider,VolumeAwareFileContentUrlProvider and test classes
121979 ACE-5093 : Allow file content URLs to be generated by a provider
- added deprecated annotation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@122918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
122252 ACE-5093 : Allow file content URLs to be generated by a provider
- implemented TimeBasedFileContentUrlProvider,VolumeAwareFileContentUrlProvider and test classes
121979 ACE-5093 : Allow file content URLs to be generated by a provider
- added deprecated annotation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@122540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
120772 amukha: ACE-4909: [Win 10, Chrome] - Site Members: Searching users with two chars results in wrapped exception
- Added a check if the tenant is disabled;
- Added JUnit test for disabled tenant and for deleted tenant.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@120786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
119086 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
118716 arebegea: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118657 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.0.N (5.0.4)
118656 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
118655 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
118542 amorarasu: Merged DEV to 5.0.2-PLUS (5.0.2-PLUS)
117462 118473 amorarasu: MNT-15147: Cloud 40 Upgrade takes too long
- Make the patch.fixPersonSizeCurrentType to not apply to tenants
- Added support for making patch.addUnmovableAspect deferred
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119927 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
119079 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
118314 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118271 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.0.N (5.0.4)
118270 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
118269 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
118268 adavis: Reverse merged 5.0.2-PLUS (5.0.2-PLUS)
<< Caused lots of failures with the real fix rather than the patched one in 39.6.6 >>
118213 adavis: Merged CLOUD39.6 (Cloud 39.6.6) to 5.0.2-PLUS (5.0.2-PLUS)
116649 cturlica: MNT-15229/MNT-15170: [Security] Java unserialize remote code execution
- added bootstrap unserializer validator: a bootstrap bean that checks that the classes that would favor Java unserialize remote code execution are not available. Check is needed because libs could be introduced by the application server (attached jars should be uploaded).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
119078 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
118305 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
118217 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.4)
118216 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to V4.2-BUG-FIX (4.2.6)
118215 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
118214 adavis: Merged 5.0.2-PLUS (5.0.2-PLUS) to 5.0.2-CLOUD (Cloud )
118213 adavis: Merged CLOUD39.6 (Cloud 39.6.6) to 5.0.2-PLUS (5.0.2-PLUS)
116649 cturlica: MNT-15229/MNT-15170: [Security] Java unserialize remote code execution
- added bootstrap unserializer validator: a bootstrap bean that checks that the classes that would favor Java unserialize remote code execution are not available. Check is needed because libs could be introduced by the application server (attached jars should be uploaded).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
119063 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
117346 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
117253 adavis: Merged 5.0.2-CLOUD (Cloud ) to 5.0.2-CLOUD42 (Cloud )
114523 adavis: Merged BCRYPT to 5.0.2-CLOUD
114045 gcornwell: MNT-14892: Enabled the UpgradePasswordHashJob (it won't run until 2099 though due to the default cron experssion) and tweaked log statements.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119902 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
