112606: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
97445: (RECORD ONLY) RM-1932 Changed the notification frequency based on 2.3 code changes
112629: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
99084: (RECORD ONLY) Merged V2.3 to V2.2 :
93334: RM-1822 (Non-system-admin user not allowed to read inheritable permissions)
99085: (RECORD ONLY) Merged V2.3 to V2.2:
92881: RM-1799 (Root category is not displayed for the non-rm-admin user who created it)
99086: (RECORD ONLY) Merged V2.3 to V2.2:
96580: RM-1904 (SubCategory moved to root have inheritance on)
112663: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
99087: Upgrade Alfresco version to 4.2.4.6
99088: RM-2026: Unable to complete historical records when mandatory meta-data missing
99089: Merged HEAD to V2.2:
89735: RM-1677- No items error for RM Admin if record was declared from moderated/private site
112665: Fix merge - delete duplicate method.
112694: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
98839: GERMAN: Updated bundle for RM 2.2.1 based on EN-rev98763
98840: SPANISH: Updated bundle for RM 2.2.1 based on EN-rev98763
98841: FRENCH: Updated bundle for RM 2.2.1 based on EN-rev98763
98842: ITALIAN: Updated bundle for RM 2.2.1 based on EN-rev98763
98843: JAPANESE: Updated bundle for RM 2.2.1 based on EN-rev98763
98844: DUTCH: Updated bundle for RM 2.2.1 based on EN-rev98763
98845: RUSSIAN: Updated bundle for RM 2.2.1 based on EN-rev98763
98846: BRAZILIAN PORTUGUESE: Updated bundle for RM 2.2.1 based on EN-rev98763
98847: SIMPLIFIED CHINESE: Updated bundle for RM 2.2.1 based on EN-rev98763
98848: BRAZILIAN PORTUGUESE: Updated file and remove of wrongly named file for RM 2.2.1 based on EN-rev98763
98849: ALL LANG: remove file that does not need to be localised
112700: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
99374: (RECORD ONLY) Merged V2.3 to V2.1.1:
96823: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)
97435: RM-1903: Can't manage permissions without "Manage Access Controls" capability
97436: RM-1903 - updates to unit tests
97595: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)
111023: RM-2566 : [RM] Incorrect message appears on the "Requested information" text box
- replaced <constraint type="Mandatory"> with mandatory="true"
112550: Merged BRANCHES/V2.1 to BRANCHES/V2.2:
112549: Update module version to 2.1.2 after merge of hot fix branch.
112668: Merged BRANCHES/V2.1 to BRANCHES/V2.2:
70625: (RECORD ONLY) Added JIRA-Ticket Info
71381: (RECORD ONLY) Fixed RM 2.1 to get it working with Alfresco 4.2.2
112951: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
112947: RM-2617 Remove duplicate token from end of localised strings.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@112953 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
112691: MNT-14728 : CLONE for HF - RM: Not all files are found when searching for a keyword using advanced search.
- partial workaround (the elements can be scrolled down but the total result number is still wrong)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@112944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
99374: (RECORD ONLY) Merged V2.3 to V2.1.1:
96823: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)
97435: RM-1903: Can't manage permissions without "Manage Access Controls" capability
97436: RM-1903 - updates to unit tests
97595: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)
111023: RM-2566 : [RM] Incorrect message appears on the "Requested information" text box
- replaced <constraint type="Mandatory"> with mandatory="true"
112550: Merged BRANCHES/V2.1 to BRANCHES/V2.2:
112549: Update module version to 2.1.2 after merge of hot fix branch.
112668: Merged BRANCHES/V2.1 to BRANCHES/V2.2:
70625: (RECORD ONLY) Added JIRA-Ticket Info
71381: (RECORD ONLY) Fixed RM 2.1 to get it working with Alfresco 4.2.2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@112700 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
98839: GERMAN: Updated bundle for RM 2.2.1 based on EN-rev98763
98840: SPANISH: Updated bundle for RM 2.2.1 based on EN-rev98763
98841: FRENCH: Updated bundle for RM 2.2.1 based on EN-rev98763
98842: ITALIAN: Updated bundle for RM 2.2.1 based on EN-rev98763
98843: JAPANESE: Updated bundle for RM 2.2.1 based on EN-rev98763
98844: DUTCH: Updated bundle for RM 2.2.1 based on EN-rev98763
98845: RUSSIAN: Updated bundle for RM 2.2.1 based on EN-rev98763
98846: BRAZILIAN PORTUGUESE: Updated bundle for RM 2.2.1 based on EN-rev98763
98847: SIMPLIFIED CHINESE: Updated bundle for RM 2.2.1 based on EN-rev98763
98848: BRAZILIAN PORTUGUESE: Updated file and remove of wrongly named file for RM 2.2.1 based on EN-rev98763
98849: ALL LANG: remove file that does not need to be localised
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@112694 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
70625: (RECORD ONLY) Added JIRA-Ticket Info
71381: (RECORD ONLY) Fixed RM 2.1 to get it working with Alfresco 4.2.2
These changes have already been ported to V2.2, but record only merges are
needed to ensure they no longer show up in the unmerged change list.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@112668 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
99087: Upgrade Alfresco version to 4.2.4.6
99088: RM-2026: Unable to complete historical records when mandatory meta-data missing
99089: Merged HEAD to V2.2:
89735: RM-1677- No items error for RM Admin if record was declared from moderated/private site
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@112663 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
99084: (RECORD ONLY) Merged V2.3 to V2.2 :
93334: RM-1822 (Non-system-admin user not allowed to read inheritable permissions)
99085: (RECORD ONLY) Merged V2.3 to V2.2:
92881: RM-1799 (Root category is not displayed for the non-rm-admin user who created it)
99086: (RECORD ONLY) Merged V2.3 to V2.2:
96580: RM-1904 (SubCategory moved to root have inheritance on)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@112629 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111622: Merged revision(s) 111616 from modules/recordsmanagement/BRANCHES/V2.2:
111947: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
111776: Merged BRANCHES/V2.1 to BRANCHES/V2.2:
111636: Merged BRANCHES/V2.1.0.x to BRANCHES/V2.1:
68559: Change base Alfresco version from 4.2.0-RC4 to 4.2.0
68568: Merge from HEAD to BRANCHES/V2.1.0.x
68569: Update module version to 2.1.0.1
76475: Merge HEAD to BRANCHES/V2.1.0.x:
76597: Merge HEAD to BRANCHES/V2.1.0.x:
74932: RM-1461: CLONE - RM slower then standard repo/sites when rendering document details when folder contains 15k documents
76598: Merged HEAD to BRANCHES/V2.1.0.x:
75102: RM Performance testing
76599: Update module version to 2.1.0.2
76601: Merged HEAD to BRANCHES/V2.1.0.x:
75186: RM Performance Improvements
76673: Root container cache to improve unfiled record browse performance
* relates to RM-1594 and RM-1595
76850: RM performance enhancements
* serach improvements
* in-place record browse improvements
* saved search via file plan browse improvements
76851: Additional unit test to check extended security with cache is working as expected.
76852: Rollback checked in config
77709: RM-1630: Error on manage references page
* regression caused by performance improvements
84337: Update version to 2.1.0.3
84421: Transaction level cahcing of declarative capability evaluation
84676: Fix build
84677: Prevent unnessary repeated creation of QName
84678: Improvements to extended dynamic authorities
* requiredFor set
* direct access to extended permission information, not via service
84679: Correct requiredFor value
88087: RM-1661 (Performance on setting permissions at a high category level)
88092: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88144: RM-1661 (Performance on setting permissions at a high category level)
88182: RM-1724 (Inheritance is not off for root categories, unfiled records, holds and transfers)
88192: RM-1661 (Performance on setting permissions at a high category level)
* Added unit tests
88193: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88358: RM-1661 (Performance on setting permissions at a high category level)
* Added unit tests
88685: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions)
88686: RM-1741 (Moved root category doesn't inherit permissions)
88687: RM-1741 (Moved root category doesn't inherit permissions)
* Unit test added
88688: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions)
* Unit test added
88691: RM-1745 (RM Admin role can only be added with read permission on the manage permission page)
88772: RM-1741 (Moved root category doesn't inherit permissions)
88860: RM-1661 (Performance on setting permissions at a high category level)
88864: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88959: RM-1746 (Moved record/category always have the inheritance on)
88960: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88961: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88962: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
91745: RM-1785 (RM: HF 2.1.0.3-33 causes permissions to not be displayed in Share everywhere else in the repo)
91838: Update version to 2.1.0.4
111641: Update Alfresco to 4.2.2.24.
111786: Fixing unresolved merge conflicts.
111793: Merged BRANCHES/V2.2.1.x to V2.2:
103185: RM-2162: Records Management patch RMv22DODModelSeparationModulePatch taking too long with large amount of records
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@111992 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111776: Merged BRANCHES/V2.1 to BRANCHES/V2.2:
111636: Merged BRANCHES/V2.1.0.x to BRANCHES/V2.1:
68559: Change base Alfresco version from 4.2.0-RC4 to 4.2.0
68568: Merge from HEAD to BRANCHES/V2.1.0.x
68569: Update module version to 2.1.0.1
76475: Merge HEAD to BRANCHES/V2.1.0.x:
76597: Merge HEAD to BRANCHES/V2.1.0.x:
74932: RM-1461: CLONE - RM slower then standard repo/sites when rendering document details when folder contains 15k documents
76598: Merged HEAD to BRANCHES/V2.1.0.x:
75102: RM Performance testing
76599: Update module version to 2.1.0.2
76601: Merged HEAD to BRANCHES/V2.1.0.x:
75186: RM Performance Improvements
76673: Root container cache to improve unfiled record browse performance
* relates to RM-1594 and RM-1595
76850: RM performance enhancements
* serach improvements
* in-place record browse improvements
* saved search via file plan browse improvements
76851: Additional unit test to check extended security with cache is working as expected.
76852: Rollback checked in config
77709: RM-1630: Error on manage references page
* regression caused by performance improvements
84337: Update version to 2.1.0.3
84421: Transaction level cahcing of declarative capability evaluation
84676: Fix build
84677: Prevent unnessary repeated creation of QName
84678: Improvements to extended dynamic authorities
* requiredFor set
* direct access to extended permission information, not via service
84679: Correct requiredFor value
88087: RM-1661 (Performance on setting permissions at a high category level)
88092: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88144: RM-1661 (Performance on setting permissions at a high category level)
88182: RM-1724 (Inheritance is not off for root categories, unfiled records, holds and transfers)
88192: RM-1661 (Performance on setting permissions at a high category level)
* Added unit tests
88193: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88358: RM-1661 (Performance on setting permissions at a high category level)
* Added unit tests
88685: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions)
88686: RM-1741 (Moved root category doesn't inherit permissions)
88687: RM-1741 (Moved root category doesn't inherit permissions)
* Unit test added
88688: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions)
* Unit test added
88691: RM-1745 (RM Admin role can only be added with read permission on the manage permission page)
88772: RM-1741 (Moved root category doesn't inherit permissions)
88860: RM-1661 (Performance on setting permissions at a high category level)
88864: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88959: RM-1746 (Moved record/category always have the inheritance on)
88960: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88961: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88962: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
91745: RM-1785 (RM: HF 2.1.0.3-33 causes permissions to not be displayed in Share everywhere else in the repo)
91838: Update version to 2.1.0.4
111641: Update Alfresco to 4.2.2.24.
111786: Fixing unresolved merge conflicts.
111793: Merged BRANCHES/V2.2.1.x to V2.2:
103185: RM-2162: Records Management patch RMv22DODModelSeparationModulePatch taking too long with large amount of records
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@111947 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
==============================================================================
Merged to :
111287: Common utility classes developed as part of refactor for RM-2549.
asSet method that works like java.util.Arrays.asList.
Also variants of java.util.Arrays.asList that take Supplier<T> rather than T.
111292: This checkin provides the non-RM-specific parts of metadata delegation, which are required for the refactor of classified renditions needed for RM-2549.
111633: Massive renaming. Delegate/Delegation becomes Referrer, Referent and things *do* make a little more sense.
111643: This is the RM-specific parts of the refactor for classified renditions - see RM-2549.
111696: Addressing code review comments.
111703: Addressing code review comments
111707: Addressing review comments. Clearer use of lambdas due to default methods in java.util.Collection.
111768: Addition of tidyup code for when clf:classified aspect is removed. Also added notes on what's to do if this ever becomes a core service.
111772: Slight refactor. ReferredMetadataService uses the registry to look up Referrals rather than the AdminService. Seems neater.
111779: Addressing review comment - don't have assoc types in the service API - have aspect names instead.
I agree with this comment. I think assoc types are an implementation detail of this service.
111855: Applying code review comment. I added an 'mr' prefix to the spring beans, which we hope will make our lives easier if this Metadata Referral stuff ever makes it into core.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@111864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111636: Merged BRANCHES/V2.1.0.x to BRANCHES/V2.1:
68559: Change base Alfresco version from 4.2.0-RC4 to 4.2.0
68568: Merge from HEAD to BRANCHES/V2.1.0.x
68569: Update module version to 2.1.0.1
76475: Merge HEAD to BRANCHES/V2.1.0.x:
76597: Merge HEAD to BRANCHES/V2.1.0.x:
74932: RM-1461: CLONE - RM slower then standard repo/sites when rendering document details when folder contains 15k documents
76598: Merged HEAD to BRANCHES/V2.1.0.x:
75102: RM Performance testing
76599: Update module version to 2.1.0.2
76601: Merged HEAD to BRANCHES/V2.1.0.x:
75186: RM Performance Improvements
76673: Root container cache to improve unfiled record browse performance
* relates to RM-1594 and RM-1595
76850: RM performance enhancements
* serach improvements
* in-place record browse improvements
* saved search via file plan browse improvements
76851: Additional unit test to check extended security with cache is working as expected.
76852: Rollback checked in config
77709: RM-1630: Error on manage references page
* regression caused by performance improvements
84337: Update version to 2.1.0.3
84421: Transaction level cahcing of declarative capability evaluation
84676: Fix build
84677: Prevent unnessary repeated creation of QName
84678: Improvements to extended dynamic authorities
* requiredFor set
* direct access to extended permission information, not via service
84679: Correct requiredFor value
88087: RM-1661 (Performance on setting permissions at a high category level)
88092: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88144: RM-1661 (Performance on setting permissions at a high category level)
88182: RM-1724 (Inheritance is not off for root categories, unfiled records, holds and transfers)
88192: RM-1661 (Performance on setting permissions at a high category level)
* Added unit tests
88193: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88358: RM-1661 (Performance on setting permissions at a high category level)
* Added unit tests
88685: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions)
88686: RM-1741 (Moved root category doesn't inherit permissions)
88687: RM-1741 (Moved root category doesn't inherit permissions)
* Unit test added
88688: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions)
* Unit test added
88691: RM-1745 (RM Admin role can only be added with read permission on the manage permission page)
88772: RM-1741 (Moved root category doesn't inherit permissions)
88860: RM-1661 (Performance on setting permissions at a high category level)
88864: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88959: RM-1746 (Moved record/category always have the inheritance on)
88960: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88961: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88962: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
91745: RM-1785 (RM: HF 2.1.0.3-33 causes permissions to not be displayed in Share everywhere else in the repo)
91838: Update version to 2.1.0.4
111641: Update Alfresco to 4.2.2.24.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@111776 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This builds on the separate MetadataReferral services to link renditions to classified source nodes via a new classifiedRendition aspect which defines a new classifiedRendition assoc. The spring bean 'classifiedRenditionAssoc' defines that only the clf:classified aspect and its metadata will be linked.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/classified_renditions@111643 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
68559: Change base Alfresco version from 4.2.0-RC4 to 4.2.0
68568: Merge from HEAD to BRANCHES/V2.1.0.x
68569: Update module version to 2.1.0.1
76475: Merge HEAD to BRANCHES/V2.1.0.x:
76597: Merge HEAD to BRANCHES/V2.1.0.x:
74932: RM-1461: CLONE - RM slower then standard repo/sites when rendering document details when folder contains 15k documents
76598: Merged HEAD to BRANCHES/V2.1.0.x:
75102: RM Performance testing
76599: Update module version to 2.1.0.2
76601: Merged HEAD to BRANCHES/V2.1.0.x:
75186: RM Performance Improvements
76673: Root container cache to improve unfiled record browse performance
* relates to RM-1594 and RM-1595
76850: RM performance enhancements
* serach improvements
* in-place record browse improvements
* saved search via file plan browse improvements
76851: Additional unit test to check extended security with cache is working as expected.
76852: Rollback checked in config
77709: RM-1630: Error on manage references page
* regression caused by performance improvements
84337: Update version to 2.1.0.3
84421: Transaction level cahcing of declarative capability evaluation
84676: Fix build
84677: Prevent unnessary repeated creation of QName
84678: Improvements to extended dynamic authorities
* requiredFor set
* direct access to extended permission information, not via service
84679: Correct requiredFor value
88087: RM-1661 (Performance on setting permissions at a high category level)
88092: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88144: RM-1661 (Performance on setting permissions at a high category level)
88182: RM-1724 (Inheritance is not off for root categories, unfiled records, holds and transfers)
88192: RM-1661 (Performance on setting permissions at a high category level)
* Added unit tests
88193: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88358: RM-1661 (Performance on setting permissions at a high category level)
* Added unit tests
88685: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions)
88686: RM-1741 (Moved root category doesn't inherit permissions)
88687: RM-1741 (Moved root category doesn't inherit permissions)
* Unit test added
88688: RM-1742 (Locally Set Permissions for moved Record duplicate parent folder Locally Set Permissions)
* Unit test added
88691: RM-1745 (RM Admin role can only be added with read permission on the manage permission page)
88772: RM-1741 (Moved root category doesn't inherit permissions)
88860: RM-1661 (Performance on setting permissions at a high category level)
88864: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88959: RM-1746 (Moved record/category always have the inheritance on)
88960: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88961: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
88962: RM-1661 (Performance on setting permissions at a high category level)
* Fixed failing unit tests
91745: RM-1785 (RM: HF 2.1.0.3-33 causes permissions to not be displayed in Share everywhere else in the repo)
91838: Update version to 2.1.0.4
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.1@111636 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
We essentially have two new services, MetadataDelegationService and MetadataDelegationAdminService, along with some spring configuration and content model configuration (this will come in the subsequent RM-specific checkin.)
metadata-delegation-context.xml defines the spring beans that form the Metadata Delegation services.
The DelegationAdminService is used to attach/detach nodes in pairs such that one node can ‘inherit’ some aspect metadata from another node - the ‘delegate’.
The Delegation class is the definition of a type of link - it’s defined by the aspects that it handles and the type of peer association that it uses to link pairs of nodes.
Delegations must be defined as spring beans in the system to be available for use and they are exposed to Java code via the DelegationRegistry class.
Note that chains of delegations (node A -> node B -> node C) are not supported. Any attempt to attach nodes in a way that would lead to a delegation chain is detected and prevented.
The DelegationService is not about the creation and destruction of links, but is about accessing the metadata on a delegate node.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/classified_renditions@111292 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
