122 Commits

Author SHA1 Message Date
Alan Davis
bfa69dcca9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58807: Categorised some more tests, less experimentation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:13:59 +00:00
Alan Davis
b9507acf29 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58794: Further experimentation with running tests together vs in their own jvm.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62035 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:12:23 +00:00
Alan Davis
e3762b0173 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58756: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58733: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58696: MNT-9111 : MS SQL Server 2008 R2 where user's default schema is not 'dbo', schema validator fails on subsequent restarts and application fails startup
         Fixed SchemaBootstrap to use the required schema from db.schema.name property if set.
         58712: MNT-9111 : MS SQL Server 2008 R2 where user's default schema is not 'dbo', schema validator fails on subsequent restarts and application fails startup
         Corrected the fix from r58696.
         Added the db.schema.name to repository.properties.
         Corrected property handling.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:08:16 +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
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
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
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
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
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
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
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
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
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
d33d2335f8 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57505: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57346: Merged DEV to V4.2-BUG-FIX (4.2.1)
         57172: MNT-9768 : ChainingUserRegistrySynchronizerTest never ending on SQL Server
         Changed the API to use the synchronization only with split transactions. Fixed the test to pass on SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:57:41 +00:00
Alan Davis
ff22f0b9b5 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57487: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57315: MNT-9805: Transformation server showing user as System
         - Fix build error - Interface has changed in 4.2


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:52:21 +00:00
Alan Davis
57f7266e48 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57478: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57288: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57264: ALF-14221: Creation and Modification Date Tests Fail in Timezones Other than BST
            - Set default time zone to Europe/London in AbstractMetadataExtracterTest
         MNT-9566: Intermittent test failure OpenDocumentMetadataExtracterTest.testSupportedMimetypes
            - Changed OpenDocumentMetadataExtracterTest to run against date objects rather than strings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61820 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:45:06 +00:00
Alan Davis
4c972ad079 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57477: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57287: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57252: MNT-9805: Transformation server showing user as System
            - Added unit test which verifies the issue
            - Added initiatingUsername field to AbstractTransformationRenderingEngine.TransformationCallable which is used to set authenticated user before running the transformation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61819 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:44:18 +00:00
Alan Davis
ed5585be0a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57475: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57285: MNT-9854 (ALF-17856) Ability to Easily Disable Certain Source and Target Media Types in ImageMagick Transformer
         - Added a unit test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:42:42 +00:00
Alan Davis
1b2764eab2 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57388: Corrected typo ;)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61815 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:41:03 +00:00
Alan Davis
c64bac3eef Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57387: If a "quick" file is in a jar then stream it to a temp file and return the File reference, BDE-195


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:40:16 +00:00
Alan Davis
32b6e12b9e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57246: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57226: Reverse Merge back to the original now we know r57085 caused the two errors
         57222: Reverse Merge in attempt to work out which commit causes the two EmbeddedSolrTest test failures in https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-23
            57116: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56986: MNT-9829: Merged V4.1.5 (4.1.5.10) to V4.1-BUG-FIX (4.1.7)
                  56818: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
                  56848: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
                  - moved to join, count and group by    as having is causing issues.
                  56868: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
                  - also protect direct acl fetch with node exists test
                  - fix test to use a sensible loop .....
         57224: Reverse Merge in attempt to work out which commit causes the two EmbeddedSolrTest test failures in https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-23
            57082: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56949: Fix for     MNT-9456  SOLR: Index error count does not decrease even if you delete/fix the problematic doc 
               - counts undeleted docs


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61801 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:31:30 +00:00
Alan Davis
3584a3249a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57242: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57222: Reverse Merge in attempt to work out which commit causes the two EmbeddedSolrTest test failures in https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-23
         << was not this one >>
         57116: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
            56986: MNT-9829: Merged V4.1.5 (4.1.5.10) to V4.1-BUG-FIX (4.1.7)
               56818: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
               56848: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
               - moved to join, count and group by    as having is causing issues.
               56868: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
               - also protect direct acl fetch with node exists test
               - fix test to use a sensible loop .....


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:28:17 +00:00
Alan Davis
a807469fba Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57241: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57221: Reverse Merge as it caused SiteServiceImplMoreTest deleteSiteAndRestoreEnsuringSiteGroupsAreRecovered to fail
         57067: 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.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:27:29 +00:00
Alan Davis
53fdfb2593 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57233: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57116: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56986: MNT-9829: Merged V4.1.5 (4.1.5.10) to V4.1-BUG-FIX (4.1.7)
            56818: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
            56848: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
            - moved to join, count and group by    as having is causing issues.
            56868: Fix for     MNT-9706  Big amount of alf_acl_change_set entries slowing down massively index times and prevent access to report / summary pages of SOLR
            - also protect direct acl fetch with node exists test
            - fix test to use a sensible loop .....


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:21:04 +00:00
Alan Davis
6a4a1d50a1 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57232: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57115: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56981: MNT-9821 follow-up: move test class to the right folder


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61787 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:20:16 +00:00
Alan Davis
71791b0c00 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57228: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57067: 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.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:17:00 +00:00
Alan Davis
1230bde9a6 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57164: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57017: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         57004: MNT-9375: Fixed the test that caused a lot of build errors (running SecurityTestSuite) when merged with 4.2 Bug Fix (build #7) 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:15:16 +00:00
Alan Davis
7ec5353411 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57163: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57016: Reverse Merge to the original
         56761: Reverse Merge: Caused lots of build errors running SecurityTestSuite. Specifically HomeFolderProviderSynchronizerTest
               which ran after AuthorityBridgeTableAsynchronouslyRefreshedCacheTest.
               See https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-7 (#11 has 30 errors including 26 from HFPST and ABTARCT)
            56562: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56138: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  56075: MNT-9375 (related to MNT-9485): MT - when users are added to site with a group addition versus individual, they are not handled as members of site
                  Added JUnit test for the issue. Added the test to SecurityTestSuite.
            56580: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                   - Build bridge cache on behalf of provided tenant user. 
            56581: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
               << last commit missed a file >>
               56026: Merged DEV to V4.1-BUG-FIX (4.1.7)
                  55892: MNT-9485: MT Users added to Alfresco Administrators group via Group addition do not have 'admin' privileges
                   - Build bridge cache on behalf of provided tenant user. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-11 20:14:29 +00:00
Alan Davis
ed0e48861d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
57151: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56939: ALF-20095 : Test failure in TestEnterpriseAtomPubTCK
      Was corrected 'ItemTest' test.


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