Commit Graph

24 Commits

Author SHA1 Message Date
Alan Davis
f4ed168615 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59346: MNT-9771: Merged V4.1.7 (4.1.7.1) to V4.1-BUG-FIX (4.1.8)
      59313: MNT-10231 : CLONE: Version History shows incorrect creator for previous versions
         -  Java-backed webscript CommentsPost added. Also auditable behavior is disabled around creating comment-node
      59326: MNT-10231 : CLONE: Version History shows incorrect creator for previous versions
         -  Posting activity item added to CommentsPost web-script. Also copyright message and comments added, @since changed to 4.1.7.1
      59334: MNT-10231: Merged DEV to V4.1.7 (4.1.7.1)
         56938: MNT-9771 : Version History shows incorrect creator for previous versions
            - Added a test to reproduce this issue


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-31 11:42:13 +00:00
Alan Davis
be5b563dad Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59264: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8) AGAIN!
      58707: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
         58676: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Delete associated groups on callback when archived site is purged. Add unit test for case.
      58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
         58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
         58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Return beforePurgeNode callback binding to Site class.
      58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
         58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
      58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
         58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59268 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-22 10:36:40 +00:00
Alan Davis
44c236573e Reverse Merge attempt at merging from V4.1-BUG-FIX (will do it again)
AND record only merge the original commits 59231,59239 and reverse merge 59262 that took place on V4.1-BUG-FIX   
   59237: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
      59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
         58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
            58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
               - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
            58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
               - Return beforePurgeNode callback binding to Site class.
         58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
            58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
               - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
         58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
            58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
               - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.
   59240: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
      59239: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
         - The merge of the HF commit on 4.1.6 removed a variable that was not being used, but
           was being used in later versions.
   59241: MNT-10237: Permissions are not restored when a deleted site is recovered from the trashcan
      - Correct error in merge from V4.1-BUG-FIX to V4.2-BUG-FIX


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59266 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-22 08:16:06 +00:00
Alan Davis
7f69061f29 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
59231: MNT-10237: Merged V4.1.6 (4.1.6.4) to V4.1-BUG-FIX (4.1.8)
      58895: MNT-10109: Merged DEV to PATCHES/V4.1.6 (4.1.6.4)
         58855: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Fix unit tests failure by purging archived sites. Forbid new site creation if site group already exists.
         58871: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Return beforePurgeNode callback binding to Site class.
      58947: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
         58946: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Fix test failures by purging deleted sites from trashcan so that sitename can be reused. Change SiteServiceImplTest to avoid database deadlock.
      58949: MNT-10109: PATCHES/V4.1.6 (4.1.6.4)
         58948: MNT-10109: Permissions are not restored when a deleted site is recovered from the trashcan
            - Fix test failures by purging deleted sites from trashcan so that sitename can be reused.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59237 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-20 19:55:48 +00:00
Alex Mukha
22176d154d MNT-10075: Merged HEAD (4.3/Cloud) to V4.2-BUG-FIX (4.2.1)
58873: Merged /BRANCHES/DEV/BELARUS/V4.2-BUG-FIX-2013_12_09 to HEAD (4.3/Cloud)
      58842 : CLOUD-2204 : Cloud2. Litmus tests. Some regression failures 
         - GetLockState including tenant
      58806 : CLOUD-2204 : Cloud2. Litmus tests. Some regression failures 
         - WebDAV-lock behavior test added for multy-tenancy 

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59202 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-20 11:19:03 +00:00
Pavel Yurke
76a27e1aa2 Merged DEV to V4.2-BUG-FIX (4.2.1)
57540: MNT-9883: Consumer can add document comments via API, bypasses UI security checks
    - Only users with 'AddChildren' permission can start discussions. 
   58305: MNT-9883: Consumer can add document comments via API, bypasses UI security checks
    - Add unit test 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59106 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-18 10:08:26 +00:00
Pavel Yurke
e952aa3ef6 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
58919 : MNT-9205 : Search by IM property with spaces doesn't work
      - Using correct regexp to split search term. Added a test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@59042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-16 14:48:58 +00:00
Alan Davis
39b761c8f6 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
58759: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
      58711: MNT-10136 CLONE - CMIS TCK Test failed
         - Restored POST: http://servername:8080/alfresco/service/cmis/test was lost when test were moved to test-java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-12-09 18:07:13 +00:00
Matt Ward
62a1db5a23 ALF-18620: WebDAV: Changing case of folder leads to error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58348 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-27 14:14:31 +00:00
Andrew Hind
91f7174614 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
58100: Build/test fixes after R 58059 revised fix for MNT-9794   Authorities with duplicate names can be easilly created using « AuthorityService »


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-21 20:27:57 +00:00
Andrey Che
34083b1a71 Merged DEV to V4.2-BUG-FIX (4.2.1)
57691: MNT-9915: (CLONE) Working copies are open in read-only mode when using Webdav online edit
      Added unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@58051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-20 17:11:07 +00:00
Pavel Yurke
2b057b1f8a Merged DEV to V4.2-BUG-FIX (4.2.1)
57207 : MNT-9777 : MS Office Documents Edited and attempted to save with MS Office 2011 for Mac apps over WebDAV causes Word to Crash
      - Changing check `is sourceParentNodeRef not equals to destParentNodeRef` to` is sourceFileInfo not euqals to destFileInfo`
   57592 : MNT-9777 : MS Office Documents Edited and attempted to save with MS Office 2011 for Mac apps over WebDAV causes Word to Crash
      - Added test for Shuffle WebDAV move within the same folder . Also added test for MNT-6480 fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57990 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-19 12:26:09 +00:00
Alan Davis
8b9b67d6eb Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
57816: Merged DEV to V4.1-BUG-FIX (4.1.8)
      57643: MNT-8989: MP4 and mov accessed over WebDav on safari or Chrome cause exceptions in log
         Added ClientAbortException check.
         Added unit tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-13 10:05:01 +00:00
Alan Davis
5c2c7396f4 Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
57560: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
      57546: Merged DEV to V4.1.7 (4.1.7)
         57541:  MNT-9618: Consecutive white spaces in cm:name are not return by the CMIS AtomPub binding
            - compress directive was removed from children.get.atomfeed.ftl and item.get.atomentry.ftl templates. Also,appropriate unit tests were added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-11-02 18:14:51 +00:00
Pavel Yurke
c98f1dc00a Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.0)
56965 : Merged DEV to V4.1-BUG-FIX (4.1.7)
      55964 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
          - Prevent folders to take part in any kind of shuffle operation.
      56308 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
         - Unit test that demonstrate issue.
      - Fixed unit test failure that causes prevous merge (r57176) to be reverted.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-29 13:10:11 +00:00
Alan Davis
5daa9edc73 Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
57220: MNT-9350: Registered Mimetypes WebScript doesn't know about the Alfresco Transformation Server
      - Added the notion of known workers and label message map
      - Added ability to override the label message map for custom implementations
      - Separated building of labels for complex and proxy transformers into their own methods
      - Added message formatting for bean names


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-29 07:18:56 +00:00
Alan Davis
47ae9098db Reverse Merged as it caused the MoveMethodTest build error in https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-25
57176: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.0)
      56965 : Merged DEV to V4.1-BUG-FIX (4.1.7)
         55964 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
            - Prevent folders to take part in any kind of shuffle operation.
         56308 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
            - Unit test that demonstrate issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57225 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-26 20:51:28 +00:00
Pavel Yurke
3210764a77 Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.0)
56965 : Merged DEV to V4.1-BUG-FIX (4.1.7)
      55964 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
         - Prevent folders to take part in any kind of shuffle operation.
      56308 : MNT-9662 : HTTP error 500 when renaming a space with a numerical name via WebDAV
         - Unit test that demonstrate issue.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@57176 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-25 09:47:15 +00:00
Alan Davis
8b67adfad4 Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
56114: MNT-9104: If username contains uppercase letters the action of joining a site will not be displayed in "My activities"
    Added the license to new test classes.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@56560 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-11 17:35:39 +00:00
Alan Davis
acae1c22c6 Merged HEAD-BUG-FIX to V4.2-BUG-FIX (4.2.1)
55500: <<NOT IN 4.1.6>> Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
      55434: Merged DEV to V4.1-BUG-FIX (4.1.7)
         54939 : MNT-9413 : NullPointerException thrown when a wiki page with a null title is renamed using Share
            - Using wiki page name, if page title isn't provided
            - Unit test was added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/V4.2-BUG-FIX/root@56494 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-10-11 04:38:10 +00:00
Derek Hulley
403fd26ace Turned WebScripts registry into an asynchronously-refreshed component
- The size of the object and the nature in which it is read means that it does not really
   fit into the clustered cache model.  We just notify the cluster if the cache entry it needs to be
   reloaded, serving stale data for a short while
 - ALF-19982: BM-0013: Reindex: WebScripts registry is repeatedly reset (DeclarativeRegistry)
 - ALF-19983 BM-0013: Reindex: Solr reindex works very slowly 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55415 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-17 14:39:25 +00:00
Brian Remmington
7f8effa1f4 Merged BRANCHES/V4.2 to HEAD:
55206: Branch created for 4.2.x releases.
   55209: Merged HEAD to BRANCHES/V4.2:
        55208: Added Sharepoint config to unit test classpath to fix VtiRequestDispatcherTest.
   55222: Merged HEAD-BUG-FIX to V4.2
        55220: Merged V4.1-BUG-FIX (4.1.7) to HEAD-BUG-FIX (4.2)
           55218: Fix for ALF-19894 Site is not displayed after restoring from Trashcan
             This bug was reported on 4.2, but the bug is also present on 4.1.
             I have added a testcase to reproduce the bug along with a fix.
             The problem was in SiteServiceImpl.delete where the code was writing an empty property value into the {}memberships property
             and therefore there was no record of which users had been members of the deleted site.
   55245: Fixed javadoc while checking that ALF-19055 was fixed.  ActivityService no longer uses 'format
   55246: CLOUD-2050 -Content changes are not synced from Cloud to On-Premise (errors in the logs)
   55249: Hazelcast: Added ability to create cache with 'read-backup-data' via property *.readBackupData
   55250: Hazelcast cache builder now accepts 'async-backup-count' value and any error in setting a value logs the full exception
   55251: Asynchronous cache: Better logging of in- and after-transaction processes
   55252: Asynchronous cache: Better logging of in- and after-transaction processes
   55266: Workflow REST API fix for variable retrieval
   55276: Merged HEAD to BRANCHES/V4.2:
        55274: Disabling Sharepoint unit tests until we can make them run properly in the build.
   55278: ALF-19889 - String for Brazilian Portuguese
   55279: Merged DEV to 4.2
        ALF-17464 : Replication jobs aren't displayed until sorting by some characteristic
           - Changing not exact equals (!==) to not euqals (!=)
   55280: Fix for ALF-19865 - Forgot password link redirects to Login page. Also cleaned up the mess that is the 'Sign in to Alfresco in the cloud' dialog.
   55281: Probable fix for ALF-19225 Intermittent test failures in SubscriptionServiceActivitiesTest
   55282: ALF-19865 - Cloud Sync profile area now looks like the rest of profile area.
   55285: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_27 to BRANCHES/V4.2:
        55068: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
   55286: Merged BRANCHES/DEV/BELARUS/HEAD-2013_08_29 to BRANCHES/V4.2:
        55207: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
        55210: ALF-19915 : MT and WebDAV: Content is lost when uploading non-empty document
   55297: As part of prep work for fixing ALF-20023 Recent Sites and Favorite Sites in copy/move pickers empty,
   55299: ALF-19556: IE10 specific fix for file upload browse (impressive how IE finds more and more innovative ways to spoil things for itself)
   55300: Fixed date issue when creating a new process instance
   55308: Resync to HEAD@55302


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55309 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-15 15:00:13 +00:00
Samuel Langlois
2eb4f9e135 Merged HEAD-BUG-FIX to HEAD (4.2.0)
55103: Move GetMethodTest to the test-java folder, where it belongs


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-09-09 08:40:29 +00:00
Samuel Langlois
788d3c9c89 Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2013-08-20 17:17:31 +00:00