Commit Graph

4936 Commits

Author SHA1 Message Date
Alan Davis
a33a07bcfb Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58718: Created a dummy file so that the parent directory gets created.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:56:37 +00:00
Alan Davis
0f52c6a51d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58657: Added some tests to the "own Jvm" category, they mess with Spring.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62010 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:52:28 +00:00
Alan Davis
436dfd3bfc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58572: Added some tests to the own Jvm category


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:50:03 +00:00
Alan Davis
47baec7514 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58542: Explicitly defining the memory requirements and categorising 2 jbpm tests as own vm.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62006 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:49:14 +00:00
Alan Davis
b644b4d440 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58522: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58512: Reverse merge
         << Caused 5 build errors >>
         58449: Merged DEV to V4.2-BUG-FIX (4.2.1)
            58425 : MNT-9711: ldap synchronization algorithm is not optimal
               - The verification for deleting permissions was added for the full synchronization.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:47:38 +00:00
Alan Davis
c0de7292bc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58520: Upped the memory for the sameVM tests and categorised the AVM tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:46:49 +00:00
Alan Davis
6aac29b931 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58519: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58459: MNT-9834 : DB2: ACT: Schema differences is present after upgrade 3.4.13 > 4.1.5 > 4.2.0
         - Output information about ignored patches it INFO level to make SchemaBootstrap more informative.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62002 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:45:53 +00:00
Alan Davis
606e1866b0 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58518: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58449: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58425 : MNT-9711: ldap synchronization algorithm is not optimal
            - The verification for deleting permissions was added for the full synchronization.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:45:06 +00:00
Alan Davis
0e7931feaf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58495: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58419: MNT-9888: WorkflowModelBuilderTest is susceptible to timezone issues
       - Fix unit tests that failed in build 77. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61996 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:41:08 +00:00
Alan Davis
2493ba39ac Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58494: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58406: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58389: Fix for MNT-9272 	Duplicate entry error after LDAP sync with user with different case from alf_authority 
         - authority case changes that imply updates that violate integrity constraints are supported.
         - if permissions exist for a non existent user "BOB" and an existing user "bob" is updated to "BOB"
              - all "bob"'s permissions will be migrated and "BOB"s  will be added (as they are treated as one and the same)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:40:19 +00:00
Alan Davis
fd77ceb85f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58489: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58379: MNT-9888: WorkflowModelBuilderTest is susceptible to timezone issues
       - Fix unit tests, because they fails in build 75.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61989 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:36:11 +00:00
Alan Davis
03b22967cc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58467: Categorized some spring tests so they run in the same vm successfully


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:35:21 +00:00
Alan Davis
135625b740 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58408: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58267: MNT-7514 : Merged DEV to V4.2-BUG-FIX
       58142 : MNT-7514 : Uninformational error message on move when file name conflicts
        Added new failure message if file exists. 
       58263 : MNT-7514 : Uninformational error message on move when file name conflicts
        Was corrected showing failure message for copy/move a file or folder. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:29:14 +00:00
Alan Davis
f29166271d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58399: Banished a memory/resource hungry test to its own jvm.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61979 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:27:41 +00:00
Alan Davis
00dbf5f791 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58398: Handles null better, and removed applicationContext reference


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61978 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:26:54 +00:00
Alan Davis
1253d2d40e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58397: Added more tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61977 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:26:07 +00:00
Alan Davis
7f8a7f9560 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58393: BDE-195 Move DeploymentServiceTest to wdr-deployment, where wcm-bootstrap xml is. Breaks the circular dependency between repository and wdr-deployment projects


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:23:46 +00:00
Alan Davis
893c902a2d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58390: Added more tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61973 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:22:57 +00:00
Alan Davis
068939e250 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58376: Added additional tests to ownJVMCategory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61971 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:20:56 +00:00
Alan Davis
9434548918 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58375: Added ownJVMCategory for repository tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61970 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:19:44 +00:00
Alan Davis
84beca8577 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58328: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58318: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58240: Merged DEV to V4.1-BUG-FIX (4.1.8) with correction
            57458: MNT-9860: Recurrent events are incorrectly displayed if recurrence doesn't recur every one day
            - Remove code that works with Calendar internal time to avoid dayligth issues. Used Calendar.add() method instead. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61965 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:16:33 +00:00
Alan Davis
eadda12eb8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58310: Merge Dev to HEAD-BUG-FIX
     MNT-8647 : inconsistent ftp authentication chain behaviour


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61955 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:09:36 +00:00
Alan Davis
1cc0bf5a5d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58270: Fixed the failing test by moving MetadataQueryTest_model.xml to test-resources


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:08:43 +00:00
Alan Davis
ad34756393 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58214: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58197: MNT-8886: Unit test added in r57899 should have removed the group it added. Caused build error in other tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61953 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:07:55 +00:00
Alan Davis
a2901da28e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58206: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58147: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58037: MNT-9932: Merged DEV to V4.1-BUG-FIX (4.1.8)
            57933: MNT-9932: Error Message while accessing cancelled workflow- task-edit link from mail notification
               - Add useful error messages for case when edit page is opened for cancelled task


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 23:01:43 +00:00
Alan Davis
afe3962384 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58198: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58062: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
           56942: Merged DEV to V4.1-BUG-FIX (4.1.7)
               56883 : MNT-9794: Authorities with duplicate names can be easilly created using « AuthorityService »
                       - Creation of the duplicated authorities is fixed. Unit tests are added.
           58059: Revised for for     MNT-9794   Authorities with duplicate names can be easilly created using « AuthorityService »
           Includes build fix from this merge
           - MNT-10010   In some cases (e.g. SiteServiceImpl) we are using onBootstrap to bind behaviour multiple times


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:52:10 +00:00
Alan Davis
2954090b55 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58196: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57982: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57979: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57968: Merged DEV to V4.1.7 (4.1.7)
               57967: MNT-9989 : CLONE - Meta-data from bulk-import not correct
               Changed log level to WARN for the file/folder that cannot be created
               while import.
               Changed the logic to fully skip the inexistent files.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61936 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:51:20 +00:00
Alan Davis
19f78279f3 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58176: BDE-195 Move wcm-bootstrap-context.xml from repository to wdr-deployment: it is AVM related. Will help to break the circular dependency between these 2 projects


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:49:42 +00:00
Alan Davis
d447b6b36a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58165: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58031: Reverse merged (again) in V4.2-BUG-FIX - merged the wrong commit
         58030: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
            56942: Merged DEV to V4.1-BUG-FIX (4.1.7)
               56883 : MNT-9794: Authorities with duplicate names can be easilly created using « AuthorityService »
                  - Creation of the duplicated authorities is fixed. Unit tests are added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61930 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:46:18 +00:00
Alan Davis
5bf400fac6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58164: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58030: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         56942: Merged DEV to V4.1-BUG-FIX (4.1.7)
            56883 : MNT-9794: Authorities with duplicate names can be easilly created using « AuthorityService »
               - Creation of the duplicated authorities is fixed. Unit tests are added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:45:28 +00:00
Alan Davis
3d12f9355b Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58160: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57999: MNT-8886: Merged DEV to V4.2-BUG-FIX
         57899: MNT-8886 Users with disabled accounts receive email notification from workflow
               -In prepareEmail.MailActionExecuter() method was added check: (!personService.isEnabled(userAuth)).
               -In AbstractMailActionExecuterTest was added testPrepareEmailForDisabledUsers() test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61925 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:42:12 +00:00
Alan Davis
554e28caca Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58066: Put wcm-bootstrap-context.xml in repository test resources, where it belongs, instead of moving it around


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61919 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:37:19 +00:00
Alan Davis
4270a9ae80 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57998: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57958: MNT-9961: Merged DEV to V4.2-BUG-FIX (4.2.1)
         57894: MNT-9961: DB2: Upgrade from 4.0.2.40 to 4.2.1 fails with NPE during database schema bootstrap
            - Throw AlfrescoRuntimeException if script is not found for database dialect


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:34:04 +00:00
Alan Davis
8fecf5f0fc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57915: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57908: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57900: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57890: Merged DEV to V4.1.7 (4.1.7)
               57718:  MNT-9500: After editing one occurrence of recurrent event the recurrence disappears
                  - Implemented the functionality that allow updating series in outlook calendar.
               57846: MNT-9500: After editing one occurrence of recurrent event the recurrence disappears
                 - Unit tests and unforeseen behaviour (deletion of updated occurrence; update of recurrence, when occurrence was deleted) were implemented. Also, mini calendar dashlet was updated.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61908 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:28:24 +00:00
Alan Davis
c9e8436ebf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57914: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57901: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57891: MNT-9559: Merged DEV to V4.1-BUG-FIX
           56210: MNT-9559: JMX Dump does not report Linux distribution
                  - In JmxDumpUtil class was added updateOSNameAttributeForLinux(String) method;
                  - Was added JmxDumpUtilTest test.
           56250: MNT-9559: JMX Dump does not report Linux distribution
           56340: MNT-9559: JMX Dump does not report Linux distribution


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:27:32 +00:00
Alan Davis
d817f0522d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57912: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57879: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57877: MNT-9926: reformat code changes from
            53236: MNT-9101 Share: Cancelling an invitation for a disabled user, the user gets deleted in the process.
            	-add tests for both internal and external user invite cancellation
                -add new aspect to identify external invites and exclude from post invite cancellation cleanup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61905 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:25:56 +00:00
Alan Davis
f6104e80a9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57852: BDE-195 Try to fix remote-api tests in Maven build: do not run rest API twice, and use JUnit category to run some tests in their own JVM


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:19:28 +00:00
Alan Davis
d582ad2904 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57810: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57787: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57748: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57711: Merged DEV to V4.1.7 (4.1.7)
               57677: MNT-9790 : CLONE - bulkimport fails when there is a very large LastModified timestamp.
                 - Using a correct ISO date parser, added a fix for date, year of that is less then 1848, test added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61892 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:15:25 +00:00
Alan Davis
b8ff47de1e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57792: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57768: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57694: Merged DEV to V4.1-BUG-FIX (4.1.8)
            57603: MNT-9284 : Upload speed using CIFS between PostgreSQL and SQL Server 2008
            Deleted an unnecessary transaction in org.alfresco.filesys.auth.cifs.CifsAuthenticatorBase#setCurrentUser.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61879 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 22:05:12 +00:00
Alan Davis
84a951b647 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57701: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57648: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57594: MNT-9770 : Merged from DEV to V4.1-BUG-FIX
          57002: MNT-9770 : WebDAV uploads over 2gb in size fails.
          Change int type to long, as content length from http request more than Integer.MAX_VALUE . 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61869 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:25:14 +00:00
Alan Davis
c791da212f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57640: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57627: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57566: Reverse Merged: Appears to have caused build failures https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV41BUGFIX-829
            57419: Merged DEV to V4.1-BUG-FIX (4.1.8)
               MNT-9794: Authorities with duplicate names can be easilly created using AuthorityService
                  - ContentModel.PROP_NAME was added for preventing the generation of new uid for every new authority nodes with the duplicated names in 'child_node_name' field into 'alf_child_assoc' table.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:21:07 +00:00
Alan Davis
881e324c76 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57639: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57626: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57419: Merged DEV to V4.1-BUG-FIX (4.1.8)
            - correction to the merge


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:20:19 +00:00
Alan Davis
3fc589c168 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57638: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57625: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57419: Merged DEV to V4.1-BUG-FIX (4.1.8)
            MNT-9794: Authorities with duplicate names can be easilly created using AuthorityService
               - ContentModel.PROP_NAME was added for preventing the generation of new uid for every new authority nodes with the duplicated names in 'child_node_name' field into 'alf_child_assoc' table.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:19:30 +00:00
Alan Davis
381a8ea850 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57637: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57624: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57607: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57604: MNT-9695: Merged V4.1.6 (4.1.6.1) to V4.1.7 (4.1.7)
               57589:  MNT-9828: CLONE - When a site is deleted, pending invites are still seen by users and connot be accepted/rejected/cleaned by the users
                  - The actioned upon node reference (actionedUponNodeRef) parameter for "cancel-workflow" action was changed to null (not node based action).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61861 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:18:42 +00:00
Alan Davis
6829e52375 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57633: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57614: Merged V4.2.0 to V4.2-BUG-FIX (4.2.1)
         57434: MNT-9874: CMIS returns wrong checkout state
          - Modify CMISNodeInfoImpl.analyseObjectId() method to check PWC on original node, not on provided version.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61857 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:15:29 +00:00
Alan Davis
bd8b00f623 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57572: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57536: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57528: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57524: Reverse Merged out of 4.1.7, as it is the cause of MNT-9873 - a new approach is needed (paging or limits on the UI side). Moving both issues to 4.1.N.
               56842: Fix for     MNT-9595    Tag manager cannot find tags past the value of solr.query.maximumResultsFromUnlimitedQuery 
               - tag queries are unlimited


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61848 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:08:14 +00:00
Alan Davis
18e8f40d81 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57529: Merded DEV to HEAD-BUG-FIX (4.3)
      57218: MNT-9727 : Remove Ant from packaged libraries
      Excluded ant-1.7.1.jar from build path of Data Model project.
      Fixed the tests and source files to use java.util.zip.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61843 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:04:15 +00:00
Alan Davis
b4e45ef15c Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57510: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57392: MNT-9805: Transformation server showing user as System
         - Fix build failure
         - Needed to modify the name of the dummy target mimetype in the test, as the code changed in 4.2 as a result of ALF-2875
           to check it matched "image*"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61840 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:01:45 +00:00
Alan Davis
f22b1b3fef Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57509: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57384: Fix for     MNT-9868     Transformation server + Lucene specific: Dead lock on startup of the second node 
      - selectNodes does not depend on the search sub-system


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61839 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 21:00:56 +00:00
Alan Davis
e733ee65f4 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57507: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57352: Merged DEV to V4.2-BUG-FIX (4.2) with corrections
         57313: MNT-9851: Bulk import must warn when finding nodes without content
          - Call afterCreateNode only if node wasn't skipped
          - Change logging in AbstractNodeImporter
          - Add/modify unit tests. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:59:19 +00:00