Commit Graph

210 Commits

Author SHA1 Message Date
David Draper
dcdfa645c1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70685: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      69750: ACE-848: Added ALFRESCO_SEARCH_ADMINISTRATORS group as well as a patch.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-19 12:50:54 +00:00
Alan Davis
10f8ccb903 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70226: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70137: Reverse Merge V4.2-BUG-FIX (4.2.3)
         << Commit appears to have resulted in lots of build errors. Not obvious why. >>
         70056: Merged DEV to V4.2-BUG-FIX (4.2.3)
            69689 : MNT-10946 : Admin is no longer able to unlock files 
               - Check if node is locked for non-admin users. Fix related test
            69751 : MNT-10946 : Admin is no longer able to unlock files 
               - Changed warn message


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70491 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:36:33 +00:00
Alan Davis
a6e1c48e84 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70223: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70056: Merged DEV to V4.2-BUG-FIX (4.2.3)
         69689 : MNT-10946 : Admin is no longer able to unlock files 
            - Check if node is locked for non-admin users. Fix related test
         69751 : MNT-10946 : Admin is no longer able to unlock files 
            - Changed warn message


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:33:29 +00:00
Alan Davis
9526c89138 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69952: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69917: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         69831: MNT-11192: TestModel.java removed from alfresco-repository-xxx.jar
             - moved TestModel.java back from **/test-java/** to **/java/**


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70468 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:12:49 +00:00
Alan Davis
5763abbf6d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69949: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69867: Fix handling of non-propagating transactions embedded in write transactions that have been forced writable (MNT-11310)
       - Test to demonstrate the failure
       - Regardless of whether a RetryingTransactionHelper was going to create a new transaction (non-propagating) or not,
         it did a sanity check of its read-write state against the desired state.  This was kicking things out for cases
         where the RetryingTransactionInterceptor should just have been going along with the current transaction.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70465 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 20:09:47 +00:00
Alan Davis
c5abaaec03 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69767: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69723: MNT-11123 : Test failure in TestEnterpriseAtomPubTCK
       Added code which check status of node (it has private working copy).
      Merged DEV to 4.2-BUG-FIX
      67109 : MNT-11123 : Test failure in TestEnterpriseAtomPubTCK
       Fixed RenditionServiceIntegrationTest.testRenderPdfDocumentLongRunningCheckout test. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70450 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:50:11 +00:00
Alan Davis
f38ddabb2d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69765: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69685: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68638: Merged DEV to V4.1-BUG-FIX (4.1.9)
            68070 : MNT-11289 : Sites deleted in 2013 cannot be restored in 2014
               - Recreate groups when a site is restored on condition that the groups are missing. Make current user site manager if there is no site managers. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:47:59 +00:00
Alan Davis
da7fdf7b10 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68549: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68315: MNT-11348 Try to fix build error


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70426 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:20:39 +00:00
Alan Davis
da9ce86dfe Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68537: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68315: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68280: MNT-11348: Merged V4.1.1 (4.1.1.28) to V4.1-BUG-FIX (4.1.9)
            Try to fix build error - Mark did a refactor in Oct 2012 r42384+r42430


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:36:53 +00:00
Alan Davis
ca174bab71 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68535: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68313: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68271: MNT-11348: Merged V4.1.1 (4.1.1.28) to V4.1-BUG-FIX (4.1.9)
            67447: MNT-11057: Bug in replication process on Aliens.
            Ignore a node that has no invadedBy property value (has no  alien aspect).
            Implemented unit-test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:34:47 +00:00
Alan Davis
b78998bd06 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68525: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68281: MNT-11350: Upgrade of Tika to 1.6-SNAPSHOT
         - Upgraded patched Tika, patched PDFBox, and other dependencies
         - Added a MediaTypeDisablingDocumentSelector to disable parsing of certain embedded attachments
         - Added TikaPoweredMetadataExtracter.buildParseContext method which sets the context's DocumentSelector if specified
         - Added setting of DocumentSelector if specified to TikaPoweredContentTransformer
         - Added MediaTypeDisablingDocumentSelector to the transformer.PdfBox bean config which disables parsing of embedded images
         - Updated PdfBoxContentTransformerTest to disable the parsing of embedded images


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:24:02 +00:00
Alan Davis
bc7fb95b83 ACE-1640: Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
70016: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70015: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70014: MNT-11437: Merged V4.1.5 (4.1.5.14) to V4.1-BUG-FIX (4.1.9)
            70009: Revised fix for     MNT-11107  Documents uploaded by another user are not filtered via tags in My Files
            Fix for     MNT-11427  Impossible to start reindex process for bm-0010 and bm-0013 tests: api/solr/aclchangesets return status:502
            - test fixes and maintain order


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70017 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-11 22:08:45 +00:00
Mark Rogers
f1825c7ab1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68227: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68017: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68002: Merged V4.1.5 (4.1.5.13) to V4.1-BUG-FIX (4.1.9)
            67573: MNT-11107: Merged DEV to PATCHES/V4.1.5 (4.1.5.13)
               66906: MNT-11107: Documents uploaded by another user are not filtered via tags in My Files
                  - For SolrDAO.getAcls select ACLs that are directly related to nodes or their defining acl is related to a node. Add the regression test.
            67575: MNT-11055: Merged DEV to PATCHES/V4.1.5 (4.1.5.13)
               57903: MNT-9964: DB2 unit tests failing
                  - Move 'exists' subquery from 'join on' to 'where' clause
            67658: MNT-11107: Documents uploaded by another user are not filtered via tags in My Files
               For ChangeSets Summary select also take into account ACLs that have defining ACL related to a node.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:36:27 +00:00
Mark Rogers
e17716edc6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68226: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68000: MNT-11015: Content indexing doesn't have transformation failover implementation
         - Failed unit test is fixed.
         - quick-differentMimetype.docx MIME type is changes from "application/msword" to "application/pdf"
         - If required transformer isn't found the more detailed message will be displayed into AssertionFailedError.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:36:07 +00:00
Mark Rogers
b9cce28a70 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68159: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67866: MNT-11072 : Auditing not logging when system is on read only mode
      Fixed audit to be recorded on a read-only system.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68441 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:20:50 +00:00
Mark Rogers
a8948748f8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68149: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67747:  Merged DEV to V4.2-BUG-FIX (4.2.3)
         66798: MNT-11015: Content indexing doesn't have transformation failover implementation
           - transformation failover implementation is added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:17:31 +00:00
Mark Rogers
cf5e452e77 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68121: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67187: MNT-10169 : Sort order by name is not always correct when the file name has alphanumeric characters
         - Fix for GetChildrenCannedQueryTest failure


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68406 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:09:19 +00:00
Mark Rogers
cfd0fd6436 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68116: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67126: Merged DEV to V4.2-BUG-FIX (4.2.3)
         66872 : MNT-10169 : Sort order by name is not always correct when the file name has alphanumeric characters
            - Overwrite RuleBasedCollator rules to consider space-character. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68404 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:08:40 +00:00
Mark Rogers
70aeb2fa4a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67750: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      66138: Merged DEV to V4.2-BUG-FIX (4.2.2)
         66134: MNT-10874 : If userA's email address is used as userB's username then the userA cannot be invited to a Share site by a non-admin user
         Added a JUnit test to simulate the issue.
         64109: MNT-10874 : If userA's email address is used as userB's username then the userA cannot be invited to a Share site by a non-admin user
         Fixed MailActionExecuter to use system user to retrieve user's locale.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:02:29 +00:00
Mark Rogers
c904728934 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67736: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      65943: MNT-10807 : Auditing does not take into account audit.filter.alfresco-access.transaction.user
      Fixed some unit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68375 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 15:59:12 +00:00
Mark Rogers
7fd2908d1e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67735: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      65767: Merged DEV to V4.2-BUG-FIX
      65559 : MNT-10807 : Auditing does not take into account audit.filter.alfresco-access.transaction.user
      Added UserAuditFilter class, inject an instance into AuditComponentImpl. Added unit test. 
      65671 : MNT-10807 : Auditing does not take into account audit.filter.alfresco-access.transaction.user
      Fixed some code problem. Reverted test from AuditComponentTest and created new UserAuditFilterTest. 
      65754 : MNT-10807 : Auditing does not take into account audit.filter.alfresco-access.transaction.user
      Included 'UserAuditFilterTest' test in a test suite. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 15:58:52 +00:00
Gethin James
ff9cbfba1f Fix for ACE-1513, ACE-1428 cm:title is tokenized and ANDed together
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-28 11:38:39 +00:00
Gethin James
e6e3814951 Added a new findSites() method for use by live-search and Site Finder (sites.get.js) for ACE-1513
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68092 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-26 16:20:13 +00:00
Alan Davis
d9de96b496 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65781: Created ACE-1249: Fix HazelcastLockStoreTxTest.testReadsWhenNoTransaction


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:20:17 +00:00
Alan Davis
3caceb54e3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65738: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65639: Merged DEV to V4.2-BUG-FIX (4.2.2)
         65624 : MNT-10477 : Lock on document being edited online persists when updating name of document
            - LockableAspectInterceptor checks for EPHEMERAL locks if they exists. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66268 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:13:54 +00:00
Alan Davis
f1a304506a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65422: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65044: Merged DEV to V4.2-BUG-FIX (4.2.2)
         65027 : MNT-10969 : FormService doesn't allow empty value in multivalued field
            - Multivalue properties may now contain empty values.
            - Unit test added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 21:07:09 +00:00
Alan Davis
798f24963d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64839: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64771: MNT-10059: Resurrect PublishingRestApiTest and PublishWebContentJbpmTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 20:06:48 +00:00
Alan Davis
dd247ae264 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64835: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64763: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2)
         64693: Merged V4.1.8 (4.1.8) to V4.1-BUG-FIX (4.1.9)
            64175: Merged DEV to 4.1.8
               64114: MNT-10796: Incorrect search result when content is deleted.
                 - DBNodeServiceImpl#deleteNode() was updated that will delete a node entry from an index. Requires retest of MNT-3337 and MNT-8485.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 20:02:30 +00:00
Alan Davis
267fffbe37 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64816: ACE-1101 Remove AVM tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 20:01:29 +00:00
Alan Davis
821ec76183 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64787: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64256: MNT-10767: Guard in AuditMethodInterceptor is too restrictive preventing subordinate service calls from producing data.
       - Fix unit test failing.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 19:55:42 +00:00
Alan Davis
23182c909d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64785: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64131: Merged DEV to V4.2-BUG-FIX (4.2.2)
         63233: MNT-10767: Guard in AuditMethodInterceptor is too restrictive preventing subordinate service calls from producing data.
          - Modify AuditMethodInterceptor to audit subordinate public services 
         64123: MNT-10767: Guard in AuditMethodInterceptor is too restrictive preventing subordinate service calls from producing data.
          - Add unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66188 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 19:53:27 +00:00
Alan Davis
b1c279bdaf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64703: Fix ACE-987: NPE in NodeEntity during post-commit write through to shared cache
    - Query selecting specific root nodes was not fully populating the stored entity
    - The failure itself mainly occurs when a check is made to prevent duplication of cache transfers
      (the cached value is the same); once the cache has an entry, the error would not have
      occurred again.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66181 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 19:45:56 +00:00
Alan Davis
263b73e5c1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64423: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62493: ACE-563: Fixed the build test failure as a result of adding the new SITE_ADMINISTRATORS group.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:37:06 +00:00
Alan Davis
8f8553ef23 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64403: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      61444: ACE-563: Added SITE_ADMINISTRATORS group as well as a patch.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:14:57 +00:00
Alan Davis
983b3640da Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64105: Reverse Merge HEAD-BUG-FIX (4.3.0.BF)
      << Reverted to see if commit was reason for build failures >>
      63912: Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
         63885: MNT-10338 : 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@64358 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:46:41 +00:00
Alan Davis
0124e5cdf8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63912: Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
      63885: MNT-10338 : 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@64334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:07:47 +00:00
Alan Davis
b00157153f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63647: Fixed ACE-290: ServiceRegistry.getRetryingTransactionHelper has been deprecated, with no public alternative
    - Removed final bits of deprecation required for ACE-290
    - Added test to ensure that ALF-18718 does not regress (need new instances of RetryingTransactionHelper)
    - Cleaned up pointless 'Non-Javadoc', added @Override, etc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:29:01 +00:00
Alan Davis
59eb2ac3de Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63645: Fixed MockedTestServiceRegistry formatting, warnings and added @Override (investigation of ACE-290 and ALF-18718)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64302 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:28:02 +00:00
Alan Davis
467ffadf06 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63067: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62765: MNT-10611: Merged DEV to V4.2-BUG-FIX (4.2.2)
         62735: MNT-10611: Exception generated in .AccessAuditor. when audited String values bigger than 1024 characters (non-MySQL)
            - Trim String and MLtext audit values to not exceed system.maximumStringLength. Add unit test for case.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:33:55 +00:00
Derek Hulley
7e2d1a95c6 Reverted 63895 (MNT-10338), which went onto the wrong branch
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-11 12:38:58 +00:00
Alex Mukha
69f2922c30 Merged DEV to HEAD (4.3.0)
63885: MNT-10338 : 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@63895 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-11 11:37:48 +00:00
Alan Davis
9dca412a8c Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62931: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62696: ACE-480  Split Data-Model into Lucene Independent and Legacy Lucene Project


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:59:18 +00:00
Alan Davis
1a7fd86ee2 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62920: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      << This was a bad merge with conflicts to do with the impl/solr directory not existing >>
      62511: ACE-482: Hybrid search can be disabled/enabled and is disabled by default.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62975 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:37:41 +00:00
Alan Davis
30b1d43c90 Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)
62901: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      61252: ACE-479  Provide Search Adapter
       - Reintegrated BRANCHES/DEV/PLATFORM1 from BRANCHES/DEV/PLATFORM1-AHIND


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-20 14:21:16 +00:00
Alan Davis
5dac63d5b5 Merged HEAD-BUG-FIX (Cloud/4.3) to HEAD (Cloud/4.3)
62592: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62550: MNT-10059 Re-enable PublishWebContentJbpmTest and PublishingRestApiTest tests, which had been lost


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-19 12:07:27 +00:00
Alan Davis
2a9600f26c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61350: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61114: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         61011: Merged DEV to V4.1-BUG-FIX (4.1.8)
            60967: MNT-10610: FilenameFilteringInterceptor.java readability
            MNT-10561 : If a folder is renamed with 8 characters that are within A-F and 0-9, the sys:temporary aspect is applied to it
            Implemented a JUnit test to simulate the issue.
            Added a check for a node to be without content in FilenameFilteringInterceptor.isNameOfTmporaryObject(String, NodeRef).
            Fixed code and JavaDoc formatting.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62410 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:10:29 +00:00
Alan Davis
4faaf92018 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61345: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61071: Merged DEV to V4.2-BUG-FIX (4.2.2)
         60764: MNT-10533: Calls during the beforeDeleteNode phase of a group deletion may confuse the AuthorityDaoImpl cache
          - First delete authority and refresh cache only after that 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:08:11 +00:00
Alan Davis
45a331e5c9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61242: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61241: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         61240: MetadataExtracterLimitsTest has too short a timeout (50ms to 500ms)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:04:12 +00:00
Alan Davis
3f9c22dd32 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61122: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60991: Merged DEV to V4.2-BUG-FIX
      60325 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Added some unit tests. 
      60443 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Added tests, debug log. Run work as system user in VersionableAspect. 
      60452 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Wrap debug statements. 
      60492 : MNT-10404 : Runas problem in workflow when package contains versioned content
       Fix if statement indents. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:54:12 +00:00
Alan Davis
1c4d662866 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61049: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60931: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60806: Merged BELARUS/V4.1-BUG_FIX-2013_11_27 (4.1.8) to V4.1-BUG-FIX (4.1.8)
            58341: MNT-8109: Moving a file over WebDAV changes the modification date although the file was not modified
               'system.preserve.modificationData' property has been added. The property controls if the logic of auditable aspect should be executed or not.
               - 'FileFolderServiceImplTest' has been fixed in accordance with changes in 'FileFolderServiceImpl';
               - 'FileFolderServicePropagationTest' has been added
            58456: MNT-8109: Moving a file over WebDAV changes the modification date although the file was not modified
               'system.preserve.modificationData' property has been added. The property controls if the logic of auditable aspect should be executed or not. Default value has been modified to 'false'. Tests were modified appropriately to respect the default value:
               - 'FileFolderServiceImplTest' has been reverted to the original state;
               - 'FileFolderServicePropagationTest' has been improved to avoid further modifications if the default value is changed;
               - 'FileFolderServicePropagationTest' has been added to 'ModelTestSuite';
               - Getter for the 'system.preserve.modificationData' property has been added to the 'FileFolderServiceImpl'


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62381 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:49:25 +00:00