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
123484 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
- Fixed TransformerPropertyNameExtractor so that it discarded limit or
max properties if its sibling max or limit value is supplied and has
a lower value (i.e. it should be used).
- Cleaned up TransformerConfigLimits.setTransformationLimitsFromProperties
- This has been a problem since 4.2.
- The problem only came to light with the switch to Java 8, as the order in which
transformer properties are loaded changed. They were being loaded in MapEntry order.
The problem did not show up in the unit tests, because they too were impacted by
the MapEntry order and ironically loaded the properties in the same order.
- Added unit tests that are supply both max an limit values.
- Enhanced the debug and toString methods in order to trace the problem.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123502 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
123406 adavis: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
123405 adavis: Reverse merged V4.2-BUG-FIX (4.2.7)
123400 adavis: Merged 5.0.N (5.0.4) to V4.2-BUG-FIX (4.2.7)
123386 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
- Fix TransformerConfigLimits.setTransformationLimitsFromProperties(...)
so that it does not clear the limit (e.g. readLimitTimeMs) when setting
the max value (e.g. timeoutMs) or the other way around. It is normal to
have both values defined for the default.transformer.
- This has been a problem since 4.2.
- The problem only came to light with the switch to Java 8, as the order in which
transformer properties are loaded changed. They were being loaded in MapEntry order.
The problem did not show up in the unit tests, because they too were impacted by
the MapEntry order and ironically loaded the properties in the same order.
- Added unit tests that are not impacted by MapEntry order.
- Enhanced the debug and toString methods in order to trace the problem.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
123386 adavis: MNT-14295 TransformerConfigLimits Behavior Differs on Java 7 vs 8
- Fix TransformerConfigLimits.setTransformationLimitsFromProperties(...)
so that it does not clear the limit (e.g. readLimitTimeMs) when setting
the max value (e.g. timeoutMs) or the other way around. It is normal to
have both values defined for the default.transformer.
- This has been a problem since 4.2.
- The problem only came to light with the switch to Java 8, as the order in which
transformer properties are loaded changed. They were being loaded in MapEntry order.
The problem did not show up in the unit tests, because they too were impacted by
the MapEntry order and ironically loaded the properties in the same order.
- Added unit tests that are not impacted by MapEntry order.
- Enhanced the debug and toString methods in order to trace the problem.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@123402 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
122910 rmunteanu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
122808 adavis: MNT-15738 Property to disable transformers by use (e.g. doclib thumbnail generation) in 4.2 is not working
- Allow 'use' style properties to be set
- Combine 'use' properties more flexibly with the default ones.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
122918 adragoi: Reverse merged HEAD (5.1)
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/BRANCHES/DEV/5.1.N/root@122921 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
122668 aleahu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
122625 aleahu: Merged V4.2.6 (4.2.6) to V4.2-BUG-FIX (4.2.7)
122548 rmunteanu: Merged DEV to V4.2.6 (4.2.6)
122546: MNT-14204: Enterprise bulkimport tool is not versioning for inplace import from two different batches
- If only version files are imported, version history is no longer removed and the version number is incremented
- Added new in-place import test and updated one streaming import test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122735 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/BRANCHES/DEV/5.1.N/root@122579 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
- New test PropertyValueCleanupTest
- Generates some data for the script to clean up
- Concurrently generates attribute values while cleanup script is running
- Checks that the script cleaned up the orphaned data
- Checks all newly-generated attributes to ensure that they survived the script in tact
- The second SQL statement modification can be reverted to produce the failure mode observed in ACE-5143
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@122471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
121772 amorarasu: Merged DEV to 5.0.N (5.0.4)
120891 121263 amorarasu: MNT-14951: Using CMIS it is not possible to retrieve the secondary or the list of the parents of a folder
- Changed getObjectParents() to return all the parents, not just the first one.
- Added junit test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
121764 nsmintanca: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4)
121709 rneamtu: Merged DEV to V4.2-BUG-FIX (4.2.7)
121670 rneamtu: MNT-13814 : Using MS word Save As pdf does not work correctly.
- Added new mimetype "application/applefile" and set it for files that starts with "._"
- Added new test for case
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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/BRANCHES/DEV/5.1.N/root@121627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120555: Merged DEV to 5.0.N (5.0.4)
120544 rneamtu: MNT-13723 : Error message not clear, when de-activating a model dynamically deployed and content still exists.
- Added externalized error message, generic for both delete and deactivate
- Do not merge this forward, it will be merged manually
120572: MNT-13723 : Error message not clear, when de-activating a model dynamically deployed and content still exists.
- Fixed failing tests
- Do not merge this forward, it will be merged manually
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@121494 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120957 rneamtu: Merged NESS/5.0.N-2016-01-05/ (5.0.4) to 5.0.N (5.0.4)
120843: MNT-14386 : renditionService.render method is creating a temporary file in User's trashcan
- Added temporary aspect on temporary rendition before delete it
120927: MNT-14386 : renditionService.render method is creating a temporary file in User's trashcan
- Added a test for case
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120969 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
120786 amukha: Merged AMUKHA/PLAT-HEAD-2016-01-11 (5.1) to HEAD (5.1)
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/BRANCHES/DEV/5.1.N/root@120848 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
120517 nsmintanca: Merged NESS/5.0.N-2016-01-05 (5.0.4) to 5.0.N (5.0.4)
120487: MNT-14958: User cannot create public/public moderated site after set site.public.group to group id does not begin with 'GROUP_'
MNT-14958: User cannot create public/public moderated site after set site.public.group to group id does not begin with 'GROUP_'
-added check and exception threat for double-prefixed authorities
-added unit test
-formatted code; removed tabs
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120593 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
