76900: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
65976: Merged BRANCHES/DEV/mward/plat1_cryptodoc to BRANCHES/DEV/PLATFORM1:
65030: ACE-669: imported main cryptodoc source into Enterprise Repository tree and fixed up package declarations/references.
65073: ACE-669: moved fileContentStore into a (switchable) subsystem.
65107: ACE-669: added (enterprise only) encrypted ContentStore subsystem.
65109: ACE-669: added files missing from previous commit, though the webscripts are not likely to work yet.
65523: ACE-669: added cryptodoc log4j settings
65524: ACE-669: imported unit tests over from cryptodoc module
65528: ACE-669: default ContentStore subsystem (unencrypted) is now configurable through property.
65678: ACE-669: ContentStore subsystem is now protected against switching from encrypted content store to unencrypted.
65752: ACE-669: created EncryptedFileContentStoreIntegrationTest - with many test failures to be fixed.
65757: ACE-669: corrected JceEncryptingContentWriter.putContent(String) to treat the method param as content, not as a source path.
65758: ACE-669: fixed JceEncryptingContentWriter.getReader() to return a decrypting-reader
65972: ACE-669: removing unused GetStatus webscript and templates
65973: ACE-669: removing GetStatus webscript spring context file.
65974: ACE-669: temporarily disabling EncryptedFileContentStoreIntegrationTest until reasons for failures are identified.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77742 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
76890: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
65482: Merge DEV to PLATFORM1
ACE-502 - Transfer service : implement transferring of categories and tags
58825 : MNT-8098 - Create categories on target runs as "System". Bug fix when removing categories which results in a "null" node ref.
58716 : MNT-8098 - transfer of categories and tags.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
76603: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0BF)
75807 : Merged DEV to V4.2-BUG-FIX (4.2.3)
75768 : MNT-11304 : Type definition response for exif aspect using browser binding is causing some JSON parsers to fail
- Use default boundaries only for numeric types
75778 : MNT-11304 : Type definition response for exif aspect using browser binding is causing some JSON parsers to fail
- Test for the fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
76596: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
<< Caused a compile error >>
76564: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
76112: Merged DEV to V4.2-BUG-FIX (4.2.3)
76109: MNT-11727: CMIS change log doesn't include change events for update operations
Move and rename operations should be shown as an UPDATE in the CMIS change log. Added unit test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
76588: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
76507: Merged V4.2.3 (4.2.3) to V4.2-BUG-FIX (4.2.4)
76354: MNT-11247 : Additional assignment events triggered at end of workflow
Added a test to simulate the issue.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
76582: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
76493: MNT-11670: Merged DEV to V4.2-BUG-FIX (4.2.4)
73830: MNT-11670: Unable to end a workflow when a timer is triggered and a rule is configured on a target folder
- Save current user info when rule is added to the pending execution. Then it can be used during rule execution if security context is empty.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77648 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
76565: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
76177: Merged DEV to V4.2-BUG-FIX (4.2.3)
74967 : MNT-11749 : It is possible to create groups with same name in race conditions
- Disallow creation of authorities with equal names
76118 : MNT-11749 : It is possible to create groups with same name in race conditions
- Remove throwing AlfrescoRuntimeException for duplicated authorities. Fix related test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
76564: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
76112: Merged DEV to V4.2-BUG-FIX (4.2.3)
76109: MNT-11727: CMIS change log doesn't include change events for update operations
Move and rename operations should be shown as an UPDATE in the CMIS change log. Added unit test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
76560: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
75816: Merged DEV V4.2-BUG-FIX to V4.2-BUG-FIX (4.2.3)
75777: MNT-11598: Escaped Freemarker query templates don't work with org.alfresco.repo.action.scheduled.CronScheduledQueryBasedTemplateActionDefinition
- Workaround with unescaping Free Marker template has been applied and tested with the newly implemented test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
75759: Reverse Merge HEAD-BUG-FIX (5.0)
74605 : Reverse Merge HEAD-BUG-FIX (5.0)
<< Caused 1 build error https://bamboo.alfresco.com/bamboo/browse/THOR-CLOUD0-384 >>
74567 : Merged DEV to HEAD-BUG-FIX (5.0)
69634 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
- TYPE_BASE is valid CMIS type
73710 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
- Create association between cmis:document and cmis:item test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77545 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
75557: ACE-2010 - EOL Legacey CMIS Inputs (2) in 5.0. Restored ContentGet and ContentInfo functionality without CMIS related infection.
- Revert changes made to CMISTest.java in r75520 merged from V4.2-BUG-FIX which is using original CMIS classes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
75551: Reverse Merge HEAD-BUG-FIX (5.0/Cloud)
74584: Reverse merged HEAD-BUG-FIX (5.0/Cloud)
<< Requires more work on the EOL branch >>
74416: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
74309: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
- Start replacing references to the original CMIS code with Alfresco and chemistry Open CMIS classes
74342: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
- Switch ServiceRegistry over to using Open CMIS classes
74406: ACE-2010 EOL Legacy CMIS Inputs (2) in 5.0
<< Compiles and starts Share without error >>
- Removed Original CMIS classes from the repository, remote-api and thor
- Moved the CMIS.DictionaryBootstrap bean into opencmis-context.xml before removing cmis-api-context.xml
- Some code was left under:
root\projects\remote-api\source\java\org\alfresco\repo\cmis
...........................................................\client
...........................................................\ws
...........................................................\rest
................................test-java\org\alfresco\repo\cmis
................................................................\ws
................................................................\rest
Will have to see if it should be be removed too, or if it is common with OpenCMIS
74407: ACE-2010 EOL Legally CMIS Inputs (2) in 5.0
- Removed left over code under:
root\projects\remote-api\source\java\org\alfresco\repo\cmis
................................test-java\org\alfresco\repo\cmis
- Removed an authentication URL test in QuickShareRestApiTest which was failing in
the same way as the tests above.
- Removed CXFAuthenticationSystemTest which appears to be using the original CMIS
74465: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
74464: ACE-2010 EOL Legacey CMIS Inputs (2) in 5.0
- New failure in QuickShareRestApiTest
- CXFAuthenticationSystemTest (deleted) was still referenced in MiscSystemTestSuite
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
75525: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
75287: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
75284: Merged V4.1.8 (4.1.8.11) to V4.1-BUG-FIX (4.1.10)
75265: MNT-11766 : User with username starting with admin gets admin rights
- Previous fix was corrected according to Derek's review.
- Unit test that demonstrates fix added.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
75520: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
75206: Merged DEV to V4.2-BUG-FIX (4.2.3)
74383 : MNT-11726 : CMIS change log isn't returning valid cmis:objectId values for deleted objects
- Use context safe objectId generation in CMISChangeLogDataExtractor. Test for the fix
74484 : MNT-11726 : CMIS change log isn't returning valid cmis:objectId values for deleted objects
- Test implemented in CMISTest
- Changed CMISConnector.isFolder(NodeRef) logic. Can cause NPE if NodeRef is not FOLDER or FILE
75113 : MNT-11726 : CMIS change log isn't returning valid cmis:objectId values for deleted objects
- alfresco-audit-cmis.xml moved to Repository project
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
74605: Reverse Merge HEAD-BUG-FIX (5.0)
<< Caused 1 build error https://bamboo.alfresco.com/bamboo/browse/THOR-CLOUD0-384 >>
74567 : Merged DEV to HEAD-BUG-FIX (5.0)
69634 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
- TYPE_BASE is valid CMIS type
73710 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
- Create association between cmis:document and cmis:item test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
74567: Merged DEV to HEAD-BUG-FIX (5.0)
69634 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
- TYPE_BASE is valid CMIS type
73710 : MNT-11339 : Unable to create relationship between cmis:document and cmis:item
- Create association between cmis:document and cmis:item test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
74254: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
74153: Merged DEV to V4.2-BUG-FIX
73664 : MNT-11667 : "createComment" method creates activity for users who are not supposed to see the file
Added "nodeRef" for json activity data.
74134 : MNT-11667 : "createComment" method creates activity for users who are not supposed to see the file
Added unit test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
74253: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
74025: Merged DEV to V4.2-BUG-FIX (4.2.3)
74013: MNT-11653 : Content Model <override> doesnt allow overriding "enforcement"
Changed the mandatory type validation.
Added model validation against xsd in the test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74886 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
74034: Merged EOL to HEAD-BUG-FIX (5.0/Cloud)
73956: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
- There are still quite a few JCR references, but some of these are for open CMIS
and 2 jcrmodel xml files
74023: ACE-2013 EOL JCR, JCR-RMI, etc in 5.0
- Repo did not start
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74869 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
74021: Merged DEV 5.0 to HEAD-BUG-FIX (5.0)
r73999: ACE-1979: BM-0015: S3 AWS error messages generated during load tests
- Emptying tag scope cache has been changed to setting content property for the cache to null to avoid zero-size writes. New test has been added for 'UpdateTagScopesActionExecuter' which covers use-case described in point 4. The fix has been tested against 'TaggingServiceImplTest'
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
73962: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
73819: Merged DEV to V4.2-BUG-FIX (4.2.3)
73811: MNT-11653 : Content Model <override> doesnt allow overriding "enforcement"
Added a test to simulate the issue.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
73702: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
73647: Merged DEV to V4.2-BUG-FIX (4.2.3)
73236: Merged DEV to DEV
71914: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
Corrected the MultiTServiceImpl.isTenantUser(String).
Added a test to simulate the issue.
73242: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
Removed @deprecated marks.
Added @Override annotations.
73244: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
Fixed formatting.
73245: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
Fixed messed javadoc.
73372: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
Implemented tests.
Fixed the getPrimaryDomain method.
73484: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
Removed wrongly committed files from r73236.
73492: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
Fixed multi line method calls.
Added additional test.
73552: MNT-11424 : MultiTServiceImpl.java check if MT is enabled in functions - username as email may return wrong result
Hardened the test's initialization and clean up methods.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74811 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
73693: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
73621: MNT-10165: CMIS 1.1 API: Impossible to remove ACL through Atom binding
Fix test failure - fix CMISTest to not affect on AuthorityServiceTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
73691: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
73613: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
73399: Merged DEV to V4.1-BUG-FIX (4.1.10)
70066: MNT-2229 Wrong user role is displayed in site members dashlet.
72036: MNT-2229 Wrong user role is displayed in site members dashlet.
- In SiteServiceImplTest was added testUserRoleInGroups() test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74806 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
73688: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
73548: MNT-10165: Merged DEV to V4.2-BUG-FIX (4.2.3)
61161: MNT-10165: CMIS 1.1 API: Impossible to remove ACL through Atom binding
- Detect permission to delete for principal and also find and delete all the concomitant basic CMIS permissions. Add unit test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74803 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
73686: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
73524: Merged DEV to V4.2-BUG-FIX (4.2.3)
69873: MNT-11072 : Auditing not logging when system is on read only mode
Added additional test for the issue.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74801 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
73457: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
73376: Merged DEV to V4.2-BUG-FIX (4.2.3)
73246 : MNT-11615 : LockServiceImpl.getLockState() throws ClassCastException
- Added toString() call for ContentModel.PROP_LOCK_LIFETIME properties in LockableAspectInterceptor.
- Unit test was corrected.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74778 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
73356: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
73285: Merged DEV to V4.2-BUG-FIX (4.2.3)
73210: MNT-11640 : Intermittent test failure: NPE in DynamicallySizedThreadPoolExecutorTest testToExpandQueue
Hardened the test.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74774 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
73355: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
73281: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
73054 (REDO MERGE): Added LockDAO.releaseLockQuiet and used it for the callback's precautionary lock release
- Fixes MNT-11507: JobLockService automatic refresh is triggering a retry under normal conditions
- Prevents a DEBUG message from RetryingTransactionInterceptor when the normal condition is for
the lock to no longer exist
73279: Fix javadoc for JobLockService.releaseLock to include @throws
This revision undoes the behaviour change of JobLockService.releaseLock introduced by:
56164: Fixes ALF-19964: Breaking API change in JobLockService.releaseLock
The JobLockService now behaves the same on 4.1.x and 4.2.x, while all bug fixes are preserved.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74773 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
73354: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
73241: MNT-11079: Merged DEV to V4.2-BUG-FIX (4.2.3)
67748: MNT-11079: "Start Workflow" email notification is not sent out if the recipient's User Name contians "@"
- During defining mail recipients first check email field and only then check if the username is the valid email address. Fix formatting and cleanup for other MailActionExecuterTest tests.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
73348: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
73162: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
73054: Added LockDAO.releaseLockQuiet and used it for the callback's precautionary lock release
- Fixes MNT-11507: JobLockService automatic refresh is triggering a retry under normal conditions
- Prevents a DEBUG message from RetryingTransactionInterceptor when the normal condition is for
the lock to no longer exist
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74766 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
73072: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
72995: MNT-11488: Merged DEV to V4.2-BUG-FIX (4.2.3)
71868: MNT-11488: Duplicate notification when notification rule set for multiple users
- Fix MailActionExecuter to send bulk message to all recipients only one time if template was not defined for rule. Add unit test for case.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74755 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
