112545: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
112271: Merged DEV to V4.2-BUG-FIX (4.2.6)
111087: MNT-11957 - move approveModeratedInvitation to InvitationService so its auditable
111792: MNT-11957: Approving a request to join site not available for auditing
- move rejectModeratedInvitation to InvitationService so its auditable
111854: MNT-11957: Approving a request to join site not available for auditing
- move acceptNominatedInvitation and cancelInvitation to InvitationService so its auditable
111890: MNT-11957: Approving a request to join site not available for auditing
- Removed obsolete methods from InviteHelper
111991: MNT-11957: Approving a request to join site not available for auditing
- move deleteAuthenticationIfUnused and sendNominatedInvitationto InvitationService so its auditable. Excluded InviteHelper.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@112558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111836: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
111765: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
111600: Merged V4.1-BUG-FIX (4.1.11) to PATCHES/V4.2.5 (4.2.5)
MNT-13871 : Count authorised users as those who've logged in, not total # of person objects
- Extra changes that are required to make authorization module build green.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@111901 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111834: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
111589: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
111531: MNT-13871: Count authorised users as those who've logged in, not total # of person objects
- Added small changes required for compilation of authorization module.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@111899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111501: Merged DEV to 5.0.N (5.0.3)
110986: MNT-14221 : CMIS aclCapability.getPermissionMappings() returns permissions that are not returned in aclCapability.getPermissions()
- Changed getRepositoryPermissions() to returned all repository permissions not only the exposed ones.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@111896 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111249: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
111099: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
110999: Merged DEV to V4.2.5 (4.2.5)
MNT-10537 : BPM Models are filtered for CMIS getTypeDefinition
- As for DictionaryModelType we should destroy dictionary when new model is deployed from classpath.
- Unit test added.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
110726: ACE-979: WebDav MT RepositoryAuthenticationDao.getUserFolderLocation() seems to be no tenant-safe
- Implemented a JUnit test.
- Fixed RepositoryAuthenticationDAO.getUserFolderLocation() to use cache keys with tenant domain and use the domain to find correct user store.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111250 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
111037: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
110885: MNT-14532: Revert changes for MNT-14474 and MNT-12849: Merged V4.2.2 (4.2.2.24) to V4.2-BUG-FIX (4.2.6): Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
110477: MNT-14532 : Revert changes for MNT-14474 and MNT-12849
-reverted revision 93098 done for MNT-12849 My Sites public API is not returning the expected list of sites
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@111102 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
110822: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
110619: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
110422: Merged DEV to V4.2.5 (4.2.5)
110332: MNT-14151 : CMIS Upload/Create in 4.2 adds the sys:hidden and cm:indexControl Aspect to documents starting with a period
- added system property in order to enable/disable cmis hidden behavior
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110935 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
110768: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
110604: Merged V4.1-BUG-FIX (4.1.11) to V4.2-BUG-FIX (4.2.6)
110200: Merged DEV to V4.1-BUG-FIX (4.1.11)
109557: MNT-6350: 'New Rule' page: 'Deep Copy' check-box is not localized
- Caching mechanism for the actions' parameters labels has been implemented. Labels for action's parameters will be loaded into RAM for the configured set of locales for each parameter of each definition of the action. Affected tests have been changed.,
110327: MNT-6350: 'New Rule' page: 'Deep Copy' check-box is not localized
- Changed locale setting to fix build failure.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
106201: SHA-1021: Add Leave Site Link to Email Template
- Added siteLeaveLink to properties for email generation in InviteSender
- Added link and styling to email template
- Updated InviteSenderTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
106196: SHA-993: Create Site Link in Email
- Modified InviteSender to add siteDashboardLink as a property being sent to the email generation
- Updated email template with siteDashboardLink
- Updated InviteSenderTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110794 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
105365: SHA-957: Create New Email Template
- Changed InviteHelper and InviteSender methods to accept emailTemplateXpath and emailSubjectKey rather than using hardcoded defaults
- Changed existing email send delegates to declare their respective emailTemplateXpath and emailSubjectKey
- Added SendNominatedInviteAddDirectDelegate with new emailTemplateXpath and emailSubjectKey
- Added SendNominatedInviteAddDirectDelegate bean definition
- Added localization messages for subject and space
- Changed sendInvite in workflow to use SendNominatedInviteAddDirectDelegate
- Updated InviteSenderTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
105016: SHA-935: Repository Invite Flow Changes
- Added new invitation-add-direct.bpmn20.xml workflow
- Added bootstrapping of new workflow
- Changed InvitationServiceImpl to allow setting of workflows used
- Added configuration of workflows used in invitationService bean
- Added repository properties for default workflows
- Changed InvitationServiceImpl.getWorkflowDefinition to take an enum argument
- Changed abstract testNominatedInvitationExistingUser to accommodate both current and new invite flows
- Added test of new flow to Activiti test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
110205: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
110092: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
110055: Merged DEV to PATCHES/V4.2.5 (4.2.5)
109047 : MNT-12226 : Alfresco fails to version metadata after uploading new content version even when autoVersionOnUpdateProps=true
- Reimplemented previous solution. Configuration properties for autoVersioning should not affect all nodes in repo. They should just provide default behavior.
- Added ability to specify default values for model properties using standard alfresco GLOBAL_PROPERTIES file.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
110090: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
110075: Fix to cover MNT-14463 and MNT-14546
- RM now works
- The basic dictionary (classpath xml files) are loaded in the first phase as before,
however, after the listeners have been registered, we now force an immediate, on-thread
refresh in order to get the full model list from the repo immediately while still
having the basic dictionary available for subsystems
- Cleanup of code in DictionaryDAOImpl
- Javadoc to make things clearer
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
110088: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
110052: MNT-14579: TS starting in read-only mode after applying 5.0.2 build 64
- This intermittent issue was probably caused by the SysAdminParams.afterPropertiesSet
checking for a valid dictionary. If this call took place too early, then it would
never allow the system to be in read-write mode unless rebooted.
- Removed the dictionary check from SysAdminParamsImpl; it is now only responsible for the 'server.allowWrite' property
- Call the TransactionServiceImpl's read-write veto code if the 'server.allowWrite' property changes
- Better logging when vetoes are placed but also when vetoes are removed
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
110087: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
110048: MNT-14554 : 5.0.2 - Node-Details
- added incompatible_improvements setting to version 2.3.20 to all FreeMarker Configurations
- this will tell free marker to escape all ?html as ?xhtml
- added more validation code: ?html to alfresco-macros.lib.ftl
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110213 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
110000: MNT-13836: Custom behaviours cannot be disabled (using disableBehaviour(QName))
- Changed class policies enabled/disabled checks. Now each behaviour at a given level must be explicitly disabled & re-enabled (unless all behaviours are disabled in the transaction).
- Added JUnit tests.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
109927: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
109904: MNT-14463: Deadlock during startup
- DictionaryDAO refinements for destroy, init and reload; includes javadoc on API
- Proper sequence for custom repo-based models:
- Destroy dictionary and force synchronous reload of basic models (reload)
- Register listeners
- Force async reload of dictionary (init), which does the repo-based loading of models
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
109818: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
109757: Merged DEV to V4.2-BUG-FIX (4.2.6)
101864 : MNT-13817 : Request to join moderated site workflow overwriting site role manually set by administrators
109516 : MNT-13817 : Request to join moderated site workflow overwriting site role manually set by administrators
- Added a test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109831 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
109729: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
109705: MNT-14463: Deadlock during startup
DictionaryDAO: Remove side-effect code in:
- DictionaryRepositoryBootstrap.register: Now it only registers listeners rathern than destroying and rebuilding the dictionary
- DictionaryDAOImpl.removeDictionaryRegistry: Now it only removes the dictionary rather than removes and reinitialized
DictionaryRepositoryBootstrap.onBootstrap:
- RESETS the dictionary (destroy, reinitialize)
- Then registers listeners
- Then fires application events
The stacks and logs for the deadlock show that the dictioanary bootstrap was triggering a background reload
and then firing the application events without checking that the dictionary had loaded. The events will now
only be fired once the dictionary has successfully retrieved an instance i.e. no other code will need to wait
for the background thread after the reset has finished.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109804 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
109438: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3)
109264: Merged V4.2.5 (4.2.5) to V4.2-BUG-FIX (4.2.6)
109214: Merged DEV to V4.2.5-PATCHES
109105: MNT-14452: Permissions not amended correctly when changing a site from private to public
- Return inheritance to the site containers when site becomes public.
109213: MNT-14452: Permissions not amended correctly when changing a site from private to public
- Unit test for change visibility
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@109800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
