Commit Graph

1196 Commits

Author SHA1 Message Date
Will Abson
badd76e80d Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71857: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71852: MNT-11233: Merged DEV to V4.2-BUG-FIX (4.2.3)
         71850: MNT-11233: Alfresco CMIS API /alfresco/api/-default-/cmis/versions/1.1/atom cannot be used with external authentication
            - Fix remoteUserMapper checking to be the same as in BaseAuthenticationFilter


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:35:27 +00:00
Will Abson
66245b22b5 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71622: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      71378: Merged V4.2.2 (4.2.2) to V4.2-BUG-FIX (4.2.3)
         << Again. 71376 should not have been RECORD ONLY >>
         71280: Merged DEV to V4.2.2-PATHCES (4.2.2)
            70814: MNT-10679: BM-0012: Run v420b1494_01: Exception from executeScript
             - Handle ClientAbortException 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74705 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:32:32 +00:00
Will Abson
9a54762925 Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71607: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70363: Merged DEV to V4.2-BUG-FIX (4.2.3)
         69771: MNT-11246: Inconsistent file handling when opening a document from history view in IE 10 compared to Firefox
         - Change document extension in case when user agent is "IE" and it's current extension doesn't correspond it's mimetype.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:31:25 +00:00
Will Abson
66827fb67c Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)
71601: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70356: MNT-11233: DEV to V4.2-BUG-FIX (4.2.3)
         67973: MNT-11233: Alfresco CMIS API /alfresco/api/-default-/cmis/versions/1.1/atom cannot be used with external authentication
            - Move RemoteUserMapper from Web-Client to Repository project. Use RemoteUserMapper in PublicApiAuthenticator to retrieve remote user from request.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74695 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-25 15:31:06 +00:00
Samuel Langlois
484ca8fcfa Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
71698: Merge V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3)
      71693: MNT-11264 Workflow public API for tasks is returning other users tasks
        Revert commit 69670: this was not a bug and the previous behaviour was the right one. This will fix failures in TaskWorkflowApiTest


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@73194 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-05 16:13:56 +00:00
Jamal Kaabi-Mofrad
1c5666c4ba ACE-1918: Surf-config patch improvements. Made:
- surfConfigFolder patch to use Cron trigger
          - surf-config SQL query more efficient
	  - changes to comments and formatting


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@73049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-04 14:39:31 +00:00
Jamal Kaabi-Mofrad
f8aef1344a ACE-1447: Added 'cm:indexControl' aspect to surf-config folder and its children so they wouldn’t be indexed. Also added an asynchronous patch.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@72733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-06-02 04:03:57 +00:00
Alan Davis
85a75da6b2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69762: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      69670: MNT-11264 : Workflow public API for tasks is returning other users tasks
       Corrected workflow public api behavior.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70443 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:44:51 +00:00
Alan Davis
962295dc5a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
69695: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68570: Merged DEV to V4.2-BUG-FIX (4.2.3)
         68084 : MNT-11237 : CMIS uploading file larger the 4mb fails
            - Ensure that temp directory exists before buffering request input stream.
            - Test webscript was added (simply buffers request input stream)
            - TempFileProvider now has method to get or create temp folder inside system temp directory
            - Unit test was added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70435 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 17:35:21 +00:00
Alan Davis
49c93a5978 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68527: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68302: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68117: MNT-11315: Merged V4.1.6 (4.1.6.17) to V4.1-BUG-FIX (4.1.9)
            64849: Merged DEV to PATCHES/V4.1.6 (4.1.6.11)
               63976 : MNT-10797 : Support HTTP Basic auth for /alfresco/cmisatom CMIS binding when using kerberos
                  - Added fallback authentication mechanism for webdav authentication filter for kerberos. So it should be possible to login via BASIC authentication when kerbeross SSO enabled.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-05-16 16:29:37 +00:00
Mark Rogers
7fb813b6ac Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68223: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67994: Merged V4.2.2 (4.2.2) to V4.2-BUG-FIX (4.2.3)
         67783: Merged DEV to V4.2.2-PATHCES (4.2.2)
            67645: MNT-10679: BM-0012: Run v420b1494_01: Exception from executeScript
             - Catch SocketException and report in log that client has cut off communication. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68471 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:35:06 +00:00
Mark Rogers
1a3013e3f3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68126: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67461: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         66886: Merged DEV to V4.1-BUG-FIX
          66841 : MNT-9905 : Pending Invites created by one site manager aren't visible to other site managers
           Execute some operation: "Invite/Search", "Pending Invites/Search" and "Pending Invites/Search/Cancel" using 'system' user. Corrected code. Added test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68411 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:10:58 +00:00
Mark Rogers
80e0409f8f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68122: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67228: MNT-7492: Merged DEV to V4.2-BUG-FIX (4.2.3)
         66153: MNT-7492: Simple Web Script fails with "transaction required" error when authentication=none
            - Retrieve baseDir of the RepoStore on behalf of System User


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68407 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:09:39 +00:00
Mark Rogers
b331e89f27 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
68118: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67153: Merged DEV to V4.2-BUG-FIX (4.2.3)
         67111 : MNT-10873 : Renaming folders while editing documents using webdav and Windows 7 can lead to 0k (empty) documents created in the trash can.
            - Empty documents are not archived eny more if were created in response to LOCK webdav method.
            - Unit test was implemented.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68405 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:09:00 +00:00
Mark Rogers
0b6c361dae Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67754: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      66874: Merged DEV to V4.2-BUG-FIX (4.2.3)
         66788 : MNT-10411 : Wrong status returned when  calling webscript api/invite/{inviteId}/{InviteTicket}?inviteeUserName={invitee uid}
            - Return propper invitation status. Fix related test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:03:47 +00:00
Mark Rogers
c351fa81e9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67749: Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
      64008: ACE-772: Topics from the sites the user is not a member of are displayed in My Discussions dashlet
         - Incorrect display of topics into "My Discussions" dashlet is fixed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68384 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:02:10 +00:00
Mark Rogers
2821d0afde Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67743: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      66008: Merged DEV to V4.2-BUG-FIX (4.2.2)
         66007: MNT-10487: Public API does not allow to query for pooled tasks with candidate-users and groups
            Corrected the previous commit made to the duplicate piece of code.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68382 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 16:01:30 +00:00
Mark Rogers
25adfb7df4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
67466: BDE-266 Move JettyComponent util classes to test source, so that we can get rid of Jetty in the war


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68341 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-30 15:48:14 +00:00
Alan Davis
227f276ab4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65911: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65744: Merged DEV to V4.2-BUG-FIX (4.2.2)
         65743: MNT-10487: Public API does not allow to query for pooled tasks with candidate-users and groups
            Do not add involvedUser to the query if candidateUser or candidateGroup is set (suggested by Frederik Heremans).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66282 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 22:28:45 +00:00
Alan Davis
afcd38825f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65603: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65504: Merged DEV to V4.2-BUG-FIX (4.2.2)
         64017 : MNT-10908 : WebDAV lock refresh calls are not processed
            - LOCK method was modified to update lock expiry date correctly.
            - PROPFIND method should not generated lock discovery response for expired locks
         64152 : MNT-10908 : WebDAV lock refresh calls are not processed
            - Unit tests to prove the fix. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66255 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 21:59:20 +00:00
Alan Davis
71cdbe8445 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65592: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65434: Merged DEV to V4.2-BUG-FIX (4.2.2)
         65008 : MNT-10551 : PUT sites/<siteId>/members/<personId>
            - Throw InvalidArgumentException if the person is not site member
         65046 : MNT-10551 : PUT sites/<siteId>/members/<personId>
            - Test for the fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66246 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 21:48:02 +00:00
Alan Davis
3913fde282 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
65590: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      65433: Merged DEV to V4.2-BUG-FIX (4.2.2)
         63225 : MNT-10536 : Public API > GET nodes/<nodeId>/comments.
            - Throw InvalidArgumentException (status 400) if detected node is not a content or a folder
         65046 : MNT-10536 : Public API > GET nodes/<nodeId>/comments.
            - Test for the fix


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66245 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-04-02 21:46:59 +00:00
David Draper
35bab76625 ACE-1172: ExtensibilityContainer update to support Surf updates
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@65685 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-27 08:11:29 +00:00
Alan Davis
305d585df2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64469: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      63596: ACE-809: Updated site-admin webscript to include the new attribute "userIsSiteManager".


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 07:34:29 +00:00
Alan Davis
c3a054b969 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64443: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      63040: ACE-493, ACE-538: created site admin Get sites API, which supports pagination.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64589 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 02:01:25 +00:00
Alan Davis
b0add3b79a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64426: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      62536: Reverted Sites Public REST API changes, committed in r61735 and r62502. Also updated CloudSiteServiceImpl overlay to override isSiteAdmin method.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:40:20 +00:00
Alan Davis
25895187d8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64416: Merged WAT1 (4.3/Cloud) to HEAD-BUG-FIX (4.3/Cloud)
      61735: ACE-493: Made Sites Public REST API Get method callable by Admins or by users that are made members of the new "Site Admin" group.
      ACE-503: Created a new PUT method in Sites Public REST API, such that it is possible to modify the visibility of a site.
      ACE-511: Created a new DELETE method in Sites Public REST API, such that it is possible to delete a site.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64562 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-15 01:29:23 +00:00
Alan Davis
98992479a4 HEAD-BUG-FIX and HEAD now identical except for expected differences
- Corrections after merges

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 19:45:16 +00:00
Alan Davis
5da5243dea Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
64100: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      64055: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2)
         63882: MNT-10876: Range Requests Can Fail For Files Over 2GB in Some Cases
            - Added checks for bytesLeft greater than Integer.MAX_VALUE


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:44:32 +00:00
Alan Davis
8c22b5885e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63888: Reverse merge
      << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEHEAD0-197, https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEHEAD0-198 >>
      63819:  Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
         63695: ACE-772: Topics from the sites the user is not a member of are displayed in My Discussions dashlet.
        - Fixed incorrect display of topics into "My Discussions" dashlet.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64331 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:04:54 +00:00
Alan Davis
d7377a2965 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63819:  Merged DEV to HEAD-BUG-FIX (4.3.0.BF)
      63695: ACE-772: Topics from the sites the user is not a member of are displayed in My Discussions dashlet.
        - Fixed incorrect display of topics into "My Discussions" dashlet.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 17:03:57 +00:00
Alan Davis
c7a7beae1c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63706: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3.0.BF)
      63631: MNT-10806: NPE with passthru SSO when client does not accept cookies
      Add improved logging for case when NTLM details can not be retrieved from session.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64317 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:48:23 +00:00
Alan Davis
cab496539d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63652: Merged DEV to HEAD-BUG-FIX (4.3.0)
      63110: ALF-20817: Wiki links e.g. [[ ]] does not handle standard wiki format [[Page#anchor]]
        - '#' symbol was added to the special characters, corrected parser to handle wiki format with anchor.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64304 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:29:59 +00:00
Alan Davis
9665248b1d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63335: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      63264: Merged DEV to V4.2-BUG-FIX (4.2.2)
         63206 : MNT-10760 : "Error loading items" in My Discussions dashlet on Site Dashboard
            - Added encoding to ISO9075 of search query for discussions.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64281 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 16:04:35 +00:00
Alan Davis
e288cc2112 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63080: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62921: Merged DEV to V4.2-BUG-FIX (4.2.2)
         62833: ALF-20448: Public API Activities : activityType org.alfresco.site.user-joined doesn't contain siteId
          - Modify ActivitiesImpl.getSiteId() method to handle situation when default tenant domain is used. 
          - Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64263 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:45:02 +00:00
Alan Davis
d6fb189489 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63066: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62716: Merged DEV to V4.2-BUG-FIX (4.2.2)
         62654: MNT-10679: BM-0012: Run v420b1494_01: Exception from executeScript
          - Report about IllegalStateException to LOG.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:32:57 +00:00
Alan Davis
2bbf9c822e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63064: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62673: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         62610: MNT-9587: Workflows task properties values are not compliant with data-dictionary-property-definitions.
         Add default name as "Task" for bpm:workflowTasks and fix WorkflowModelBuilder to return default property values if no were set


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:31:03 +00:00
Alan Davis
957c03475d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63061: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62574: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         62526:  Merged DEV to V4.1-BUG-FIX (4.1.8)
            59843: MNT-2258: IE's File Download box does not show a filename correctly when that have non-ASCII characters in the filename
              - Use legacy filename token with encoded value in "Content-Disposition" header on file download operation for IE7 too.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:28:09 +00:00
Alan Davis
c5ebe07269 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
63058: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      62625:  Merged DEV to V4.2-BUG-FIX (4.2.2)
         61010: MNT-10555: Sometimes, documents are locked by Office but not locked by Alfresco
           - Give access to WebDAV operation, when a lock has expired.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64245 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:25:18 +00:00
Alan Davis
b12e82ed59 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60524: MNT-10491: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60523: MNT-10490: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60522: MNT-10489: Merged V3.4-BUG-FIX (3.4.14) to V4.1-BUG-FIX (4.1.8)
            60521: MNT-10488: Merged CLOUD-R31 to V3.4-BUG-FIX (3.4.14)
               60520: HOTFIX MNT-10484 [Security] Any OS file can be retrieved via WebDAV
                  - Change suggested by Viachaslau Tikhanovich at 24-Jan-14 05:14 PM GMT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64241 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-14 15:21:33 +00:00
Alan Davis
7f60987afa Reverse merged HEAD (4.3.0)
<< factory.setFeature calls in original commit caused a problem when we
      reverted 60910 on HEAD-BUG-FIX in 62782. 60910 included code to
      remove the factory.setFeature calls so we don't see the problem on
      earlier branches which still has this commit. Removing the original
      commit also removes them and should fix the problem. >>
   60525: MNT-10492: Merged HEAD-BUG-FIX (Cloud 33/4.3) to HEAD (Cloud 32)
      60524: MNT-10491: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
         60523: MNT-10490: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
            60522: MNT-10489: Merged V3.4-BUG-FIX (3.4.14) to V4.1-BUG-FIX (4.1.8)
               60521: MNT-10488: Merged CLOUD-R31 to V3.4-BUG-FIX (3.4.14)
                  60520: HOTFIX MNT-10484
                     - Change suggested by Viachaslau Tikhanovich at 24-Jan-14 05:14 PM GMT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@63587 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-03-04 13:36:34 +00:00
Alan Davis
54b3ff43ab 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
1608cbbd4b Merged HEAD-BUG-FIX (Cloud/4.3) to HEAD (Cloud/4.3)
62731: Use RetryingTransactionHelper during authentication as an attempt to fix Oracle build failures during WebService test initialization


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-19 13:18:04 +00:00
Alan Davis
b9ab82bd33 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
61357: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      61292: MNT-10608 : java.net.SocketException: Software caused connection abort: recv failed
      'IOException' exception is now handled in the same way as 'JSONException' exception. No more exceptions are thrown.
      Also license header has been added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 15:12:46 +00:00
Alan Davis
765dbc4c41 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60936: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      60809: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         60792: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2014_01_08 to BRANCHES/DEV/V4.1-BUG-FIX:
            60183: MNT-10373 : WebDAV - Repeat save of existing text documents into Alfresco on Mountain Lion loses version history
         Also, added test to RenameShuffleDetectionTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 14:43:06 +00:00
Alan Davis
4b75744151 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60017: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59976: WebDAV: AccessDenied exceptions should not have stack traces logged.
      A general fix, but also relevant to MNT-10380 in particular.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62254 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:59:14 +00:00
Alan Davis
3fb2fdf48d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60016: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59975: MNT-10380: (WebDAV) access denied when attempting to rename file should result in error message.
      Previously fixed for same issue (was ALF-14398) but lost (most likely during a large merge).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:58:23 +00:00
Alan Davis
3deba7f983 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
60007: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59937: Revert the reverse
         59870: Reverse merged
            << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-129 >>
            59804: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
               59711: Merged DEV to V4.1-BUG-FIX (4.1.8)
                  58460: MNT-10037 : WebDAV PutMethod needs better test coverage
                  Implemented the tests for WebDAV PUT method.
                  58834: MNT-10037 : WebDAV PutMethod needs better test coverage
                  Added test files.
                  59499: MNT-10037 : WebDAV PutMethod needs better test coverage
                  Fixed the testPutNullContent test.
                  59501: MNT-10037 : WebDAV PutMethod needs better test coverage
                  Fixed formatting.
            59806: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
               59716: MNT-10037 : WebDAV PutMethod needs better test coverage
               Changed the fallout of the PutMethod.executeImpl() to run in the same transaction to prevent deadlock.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62244 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:51:38 +00:00
Alan Davis
9d073ea7ee Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59903: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59870: Reverse merged
         << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-129 >>
         59804: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
            59711: Merged DEV to V4.1-BUG-FIX (4.1.8)
               58460: MNT-10037 : WebDAV PutMethod needs better test coverage
               Implemented the tests for WebDAV PUT method.
               58834: MNT-10037 : WebDAV PutMethod needs better test coverage
               Added test files.
               59499: MNT-10037 : WebDAV PutMethod needs better test coverage
               Fixed the testPutNullContent test.
               59501: MNT-10037 : WebDAV PutMethod needs better test coverage
               Fixed formatting.
         59806: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
            59716: MNT-10037 : WebDAV PutMethod needs better test coverage
            Changed the fallout of the PutMethod.executeImpl() to run in the same transaction to prevent deadlock.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62223 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:34:26 +00:00
Alan Davis
3200944b6d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59902: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59806: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.2)
         59716: MNT-10037 : WebDAV PutMethod needs better test coverage
         Changed the fallout of the PutMethod.executeImpl() to run in the same transaction to prevent deadlock.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 09:33:33 +00:00