Commit Graph

5288 Commits

Author SHA1 Message Date
Will Abson
5adf37ba71 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75092: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74393: Removed the extra step when posting activities, its now enhanced from the queue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75421 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:32:27 +00:00
Will Abson
71352485d3 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75091: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74392: Update tests for mmt version check logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:32:19 +00:00
Will Abson
d1e580887c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75090: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      74391: Better logging/messages from the mmt


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75418 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:32:11 +00:00
Will Abson
e5ec4ddaa3 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75088: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73976: Improvements to activities post events for ACE-1707


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75416 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:31:54 +00:00
Will Abson
768f33d45e Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75087: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73975: Better handling/logging of ModuleDetails version errors


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:31:44 +00:00
Will Abson
1b64f0c442 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75083: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73270: Added Site creation event


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75411 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:31:10 +00:00
Will Abson
6fd997a096 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75082: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73269: Renamed ContentReadEvent to ContentEventImpl


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:31:01 +00:00
Will Abson
3bd6b5aedc Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75078: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73045: Quick share returns the node id


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75406 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:30:26 +00:00
Will Abson
3f23affb37 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75077: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      73044: The default event publisher can do more, then only 1 method to implement


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75405 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:30:16 +00:00
Will Abson
bd961cb020 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75070: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      72987: Raise an event when sharing via quickshare: ACE-1709


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75400 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:29:35 +00:00
Will Abson
54c2fa7c42 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75050: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      72319: Various hacks to get around issues with the ant system-build-test classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:12:42 +00:00
Will Abson
4892876aff Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75047: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71978: Re-enabled cmis download test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:12:19 +00:00
Will Abson
69c039eb3a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75042: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71872: Ignoring download test to see if that helps the build.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:11:41 +00:00
Will Abson
9fe19c3be1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75034: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71718: Added a bridge between posting activities and event publishing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:10:36 +00:00
Will Abson
6566d7c557 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75033: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71717: Added an event publishing test for CMIS - ACE-1709


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:10:28 +00:00
Will Abson
567f58eca1 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75032: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71716: Added a webscript to raise browser events ACE-1709


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75360 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:10:20 +00:00
Will Abson
f4f3bdd860 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75030: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71714: Added a event publishing test to WebDAVHelper


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:10:04 +00:00
Will Abson
31426f765a Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75028: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71712: Added BrowserEvent to the EventPublisher interface


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:09:44 +00:00
Will Abson
0ce189bbfa Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75027: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71711: Raises a ContentReadEvent when content is downloaded via cmis


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:09:37 +00:00
Will Abson
16f1627f68 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75024: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      71708: Initial implementation of Alfresco Events publishing interfaces


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:09:11 +00:00
Will Abson
9aaca71a50 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75011: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      70370: Cleaned up the solr stats code, added security check and tenants


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75339 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 15:00:02 +00:00
Will Abson
ceeee50b22 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75005: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      70182: WIP, allows date ranges for solr stats queries


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 14:59:19 +00:00
Will Abson
1962cab130 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)
75000: Merged WAT2 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      69908: Initial version of Solr Stats service and webscript


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@75329 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-07-01 14:58:38 +00:00
Will Abson
2fd7b9b7c5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:39:07 +00:00
Will Abson
95ef8e44c7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:38:52 +00:00
Will Abson
cd73ccac47 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
74350: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74257: MNT-11659 : Merged PATCHES/V4.2.2 (4.2.2.3) to V4.2-BUG-FIX (4.2.3)
            73876: Merged DEV to PATCHES/V4.2.2 (4.2.2.3)
               73489 : MNT-9038 : Names of groups are wrong after upgrade.
                  - Renaming of authorities display names


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74900 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:36:46 +00:00
Will Abson
41f0796f63 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
74317: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      74274: Merged DEV to V4.2-BUG-FIX (4.2.3)
         73971 : MNT-11227 : getObjectResponse does not provide a valid xml response against Alfresco-Core.xsd
             - Changing order of elements in xml response for getObject method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:34:55 +00:00
Will Abson
732b8a48e0 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
74282: Removed unused and untested bridge table options


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:33:55 +00:00
Will Abson
e9f9812165 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:33:14 +00:00
Will Abson
67ebe0412b Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:33:06 +00:00
Will Abson
35ab604549 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
74238: Add missing tests in the Maven build.
   Re-enable assertions in repository test execution, now that the test with the failing assertion is gone


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74877 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:31:57 +00:00
Will Abson
fc0688f871 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:29:42 +00:00
Will Abson
347b91ac1f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:28:14 +00:00
Will Abson
8d6d4e9e88 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73990: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)
      73920: MNT-11653 : Content Model <override> doesnt allow overriding "enforcement"
      Added clean up for the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:18:24 +00:00
Will Abson
2cbb29e38c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:17:33 +00:00
Will Abson
20fe538cb3 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73883: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73717:  Merged DEV to V4.2-BUG-FIX (4.2.3)
         73669: MNT-11163: CMIS - querying for folders raises CmisPermissionDeniedException 
           - CmisPermissionDeniedException is fixed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:11:26 +00:00
Will Abson
176c2069be Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:08:29 +00:00
Will Abson
30007f936d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:08:01 +00:00
Will Abson
110275a785 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73692: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73618: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         73617: Merged V4.1.9 (4.1.9) to V4.1-BUG-FIX (4.1.10)
            73566: MNT-11647: Impossible to check in the google spreadsheet
            Cookies handling has been disabled for spreadsheet service. It causes 'java.lang.IllegalArgumentException: Trying to set foreign cookie' due to changes in Google API


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:07:53 +00:00
Will Abson
c155d62f06 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:07:45 +00:00
Will Abson
88f2d1dc6f Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73690: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73594: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.3)
         73593: Merged V3.4-BUG-FIX (3.4.15) to V4.1-BUG-FIX (4.1.10)
            73526: MNT-11319: Merged DEV to V3.4-BUG-FIX (3.4.15).
               73508: MNT-11319 Accented Characters wrongly unzipped
                      - In Import dialog was added drop down list of encoding options. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:07:37 +00:00
Will Abson
b1bb208eb8 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:07:21 +00:00
Will Abson
f8eb3f7f62 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73687: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73547: Merged DEV to V4.2-BUG-FIX (4.2.3)
         69607: MNT-11072 : Auditing not logging when system is on read only mode
         Additional fixes are required for AuditMethodInterceptor and AuditComponentImpl to write audit on read-only server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74802 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:07:13 +00:00
Will Abson
7aa8714450 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:07:05 +00:00
Will Abson
76ac76b6a7 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73608: Fix badly formatted package.html files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 16:05:04 +00:00
Will Abson
7a50449b81 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 16:03:05 +00:00
Will Abson
f19218865c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 15:59:42 +00:00
Will Abson
133428c149 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 15:59:34 +00:00
Will Abson
0b5a6de25c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
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
2014-06-25 15:59:25 +00:00
Will Abson
a6cd47c741 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
73353: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73240: Merged DEV to V4.2-BUG-FIX (4.2.3)
         73207: MNT-11314 : Intermittent test failure: CachedContentCleanupJobTest.filesNewerThanMinFileAgeMillisAreNotDeleted
         Hardened the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:59:16 +00:00