102879: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
102769: MNT-13947: Merged DEV to 5.0.N (5.0.2)
102637: MNT-13947: Java API: ServiceRegistry has incorrect bean ids
- Fix ServiceRegistry to return beans by correct ids. Add unit test that checks ServiceRegistry getters.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
102709: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
102490: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
102292: Merged DEV to V4.2-BUG-FIX (4.2.5)
101892: MNT-13670 : Description is not displayed for content type D:lnk:link
- Added mapping cmis:description for Cmis 1.0.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103539 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
102708: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
102489: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
102284: Merged DEV to V4.2-BUG-FIX
101812 : MNT-13710 : User cannot change site role if its current role contains an underscore
- Added new unit test. Corrected some code.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
102706: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
102487: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
101885: Merged DEV to V4.2-BUG-FIX (4.2.5)
101133: MNT-13531: EMLTransformer ignoring multipart emails
- updated transfer in order to identify multiparts and correctly process them
- added tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@103536 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
102258: Support for ACE-1021 SOLR 4 - Sharding/Replication/Cluster/CloudACE-3827 SOLR 4 - Shard based on ACL hash
- the code to support index sharding by ACL ID and query execution
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102534 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
102238: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
102178: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
102050: Merged DEV to V4.2-BUG-FIX (4.2.5)
101782: MNT-13751: MNT-12196 may corrupt node property values when auditing pre-call data
- Changes provided by customer and unit test.
102011: MNT-13751: MNT-12196 may corrupt node property values when auditing pre-call data
- Corrected unit test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102285 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
102180: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
102046: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
101946: Merged DEV to V4.2-BUG-FIX (4.2.5)
101416: MNT-13781: ModuleService is not available via a ServiceRegistry getter
101888: checkstyle fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
102053: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
101917: Merged DEV to 5.0.N (5.0.2)
101898 : MNT-13826: Activiti engine throwing NPE when changing a long String (>4000 characters) to a normal String (<4000 characters))
- Replaced deprecated methods
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102199 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
101930: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
101819: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
101764: MNT-13697: Merged V4.2.4 (4.2.4.7) to V4.2-BUG-FIX (4.2.5)
101112: MNT-13736 : CLONE - bad LDAP connection management: connections maintained IDLE unnecessarily
- Added possibility to configure ldap connection pool parameters through the standard alfresco properties file.
- Pooling may be disabled completely.
- Updated logic of LDAPUserRegistry.java for better handling of unused objects (mainly by calling close() method).,
101119: MNT-13736 : CLONE - bad LDAP connection management: connections maintained IDLE unnecessarily
- Corrected the way of applying pool properties. They should be set as system properties (not environment!).
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@102072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
101750: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
101639: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
101402: MNT-10032 : CMIS: "delete" action with unchecked "delete all version" checkbox.
- Revert document to previous version on deleteObject with AllVersions unchecked.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101852 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
101747: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
101635: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
101289: Reverse merged V4.2-BUG-FIX (4.2.5)
<< Brought back the changes >>
98889: Reverse merged V4.1-BUG-FIX (4.1.10)
<< Caused a performance problem found in 5.0.1 testing >>
Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
93762: Fix for MNT-13198 BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
- use the bridge table to list sites.
93802: Fix for MNT-13198 BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
- use hasSite to check for existence and fix person lookup case sensitivity configuration
98886: Reverse merged V4.1-BUG-FIX (4.1.10)
<< Original commits for this issue caused a performance problem found in 5.0.1 testing >>
98334: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
98326: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
- Changed the PersonSitesRelation to use a faster API (SiteServiceImpl.listSiteMemberships(String, int)).
98452: MNT-13198: BM-0012: Run v420b1494_01: (CMIS) GetSites is Slow
- Corrected the solution to fix the build failures.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101849 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
101658: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
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@101705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
101651: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
101403: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
101245: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.5)
101157: Merged V4.1.10 (4.1.10) to V4.1-BUG-FIX (4.1.11)
101099: MNT-13607: Merged DEV to PATCHES/V4.1.10
101029: MNT-13607: Sending two emails to inbound server at the same time & same subject causes error
- Rethrow DuplicateChildNodeNameException which occurred during message processing as ConcurrencyFailureException to force retry. Add unit test for case.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
101647: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
101286: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
100798: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
- Filter inherited permissions before try to remove them
- Added unit test for case using jetty
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
101643: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
101252: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
101207: Merged DEV to V4.2-BUG-FIX (4.2.5)
100710: MNT-13479 : Attempting to start IMAP service on port 143 from non-priveledged user fails quietly.
- added code to throw exception if imap server fails at startup
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100991: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
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
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101006 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100990: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
100834: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
100784: Merged DEV to V4.2-BUG-FIX (4.2.5)
100732: MNT-13655 : Just first keyword of the IPTC keywords list is extracted as metadata and put into description field of an image
- Added special way for handling multi-valued meta-data properties retrieved from parser.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100983: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
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
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100998 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100866: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
100808: Fix compile error as a result of:
Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
99878: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
99807: Merged DEV to V4.1-BUG-FIX (4.1.10)
99672: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
- Unit test to demonstrate issue was implemented.
- Previously suggested fix was also merged.
99781: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
- Updated javadoc for new method in ContentDataDAO.
- Corrected logic of eager cleaner. If store is read-only content should not be deleted.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100858: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
100769: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
100158: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
100074: MNT-13579: IMAP: Sync doesn't work anymore after a Site which is already marked as IMAP favorite got deleted in Share.
- Added a check to handle non-existent sites.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100928 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100846: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
100757: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
99879: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
99811: Merged DEV to V4.1-BUG-FIX (4.1.10)
99257 : MNT-9557 : VersioningService.getAllVersions() does not include all applied aspects in the returned extension data
- Return a current node as head version in version series
99649,99789 : MNT-9557 : VersioningService.getAllVersions() does not include all applied aspects in the returned extension data
- Test for the fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100916 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100845: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
100756: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
99878: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
99807: Merged DEV to V4.1-BUG-FIX (4.1.10)
99672: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
- Unit test to demonstrate issue was implemented.
- Previously suggested fix was also merged.
99781: MNT-12150 : Centera Connector : isContentUrlSupported is returning false for the Centera store
- Updated javadoc for new method in ContentDataDAO.
- Corrected logic of eager cleaner. If store is read-only content should not be deleted.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100844: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
100755: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
99877: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
99796: MNT-10999: CMIS: Version is not increased after deleting Content Stream
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100843: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
100754: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
99876: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
99778: Merged DEV to V4.1-BUG-FIX (4.1.10)
81615 : MNT-12101: Workflow loses the line feed in the description
- Ignoring of trim for MLValues
81620 : MNT-12101: Workflow loses the line feed in the description
- Added a property to show value with line breaks
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100265: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
100257: Reverse Merge 5.0.N (5.0.2)
<< Cause 4 build errors >>
100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
- Filter inherited permissions before try to remove them
- Added unit test for case
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100574 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100261: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
100252: Merged 5.0.1 (5.0.1) to 5.0.N (5.0.2)
99925: MNT-13677: Added model validation to make sure the model cannot be deleted/deactivated when its types/aspects are parent to other models� types/aspects.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100243: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
100165: Merged NESS/5.0.N-2015_03_23 (5.0.2) to 5.0.N (5.0.2)
99977: MNT-13628 : No matching ACE found to remove" error when removing all the ACLs with removeAcl method and 1.1 Browser implementation
- Filter inherited permissions before try to remove them
- Added unit test for case
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
100117: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
99965: Merged DEV to 5.0.N (5.0.2)
98656: MNT-13529 : Just-installed Alfresco does not return a CMIS latestChangeLogToken
- Add initial change log token
99911: MNT-13529 : Just-installed Alfresco does not return a CMIS latestChangeLogToken
- Added test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
99772: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
99715: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
99478: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5)
96530: MNT-13161: Disabling Archive Core in SOLR breaks admin-searchservice reporting for Alfresco core
- Changed the logic of org.alfresco.repo.search.impl.solr.SolrChildApplicationContextFactory.getProperty(String) to gracefully parse the properties if one of the cores is missing.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100499 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
99771: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
99702: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
99655: Reverse Merge V4.2-BUG-FIX (4.2.5)
<< Caused build failures >>
99553: MNT-12628: Following on from MNT-12501 - Rollback of synchronous transactions is not behaving consistently
- Added a static variable holding the RollbackOnly state to RetryingTransactionHelper. Currently used by RetryingTransactionInterceptor.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100498 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
99766: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
99697: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
99632: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5)
99437: MNT-11219 and MNT-13533: Merged DEV. V4.1-BUG-FIX (4.1.10) to V4.1-BUG-FIX (4.1.10):
98490: MNT-11219: Incorrect behavior during alternate replication from multiple repositories.
- Pruning has been changed to be done for 'manifestRepositoryId' instead of 'fromRepositoryId', to avoid removals for repositories for which replication has not been initiated. Also the calculation of invasions has been modified to take into account the situation, when the folder is invaded only by one repository (by the source repository, from which this folder has come; MNT-11219). Additionally, the 'expectedChildNodeRefs' initialization was modified to resolve nodes from another repository by path, to avoid comparison of NodeRefs of two different repositories. This modification removes redundant and dangerous pruning. And it is needed for both MNT-11219 and MNT-13533
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100493 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
99764: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
99695: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
99553: MNT-12628: Following on from MNT-12501 - Rollback of synchronous transactions is not behaving consistently
- Added a static variable holding the RollbackOnly state to RetryingTransactionHelper. Currently used by RetryingTransactionInterceptor.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
99533: Put back the package level methods overridden by the Cloud mock FileContentStore
- The FileContentStore changes reduced some string parsing by calling different, internal
methods. Unfortunately, these are overridden in the Cloud build, to mimic the the behaviour of the TenantS3ContentStore.
- Files were being written to tenant-specific stores but read from the general store, where they didn't exist.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99547 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
99486: Merged DEREK/BM-0004 (5.1.0.BM4) to HEAD-BUG-FIX (5.1/Cloud)
98804: Part 2: ACE-1021 SOLR 4 - Sharding/Replication/Cluster/Cloud
- SOLR 4 - support multiple stores requested via search parameters
- explicit federation over a specified set of stores and related SOLR 4 indexes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@99545 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
