Commit Graph

333 Commits

Author SHA1 Message Date
Alan Davis
0144810a6d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59269: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59268: 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/HEAD/root@62125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:24:08 +00:00
Alan Davis
dd04a7ebfa Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59267: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (4.3/Cloud)
      59266: 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/HEAD/root@62124 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:23:12 +00:00
Alan Davis
526725db7d Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59259: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      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/HEAD/root@62123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:22:17 +00:00
Alan Davis
8d76c8edf7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59256: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      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.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:19:54 +00:00
Alan Davis
efca2709c9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59252: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59196: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58963 : MNT-10006: SPP: NPE occurs for recurrent event which occurs monthly/yearly on any weekday/weekend day
            - Support of day/weekday/weekend recurrence pattern was implemented
            - Unit tests are added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:16:36 +00:00
Alan Davis
1300d9bd3a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59177: Fixes SlowContentStoreTest test breakage. Removes dependency on cachingstore/test-context.xml
   This fix essentially denormalizes the various Spring context XML files in the cachingstore directory. A previous fix had aliased the cachingContentStore to fileContentStore, but unfortunately this broke the SlowContentStoreTest tests, as the cachingContentStore created by those tests is not a real/working content store (the backingStore is a SlowContentStore dummy store), so the bootstrap process failed.
   By making each of the contexts standalone, the different tests are able to evolve as required without breaking the other tests.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:10:13 +00:00
Alan Davis
8a8cf1b81a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59123: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59111: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         59070: Merged DEV to V4.1-BUG-FIX (4.1.8)
            58849: MNT-10096: MT: AbstractTenantRoutingContentStore can return null list of stores
              - Ensure that RetryingTransactionHelper starts a transaction in txn-after-completion phase (MNT-9806).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62103 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:06:17 +00:00
Alan Davis
68bfd2b72e Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59120: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59105: Fix broken tests in LockableAspectInterceptorTest.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62100 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:03:54 +00:00
Alan Davis
4d8e6900a7 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59116: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59088: Fix broken test SlowContentStoreTest.readsAreFasterFromCache


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:00:48 +00:00
Alan Davis
2a96f57a17 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59115: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59087: Fix broken test StandardQuotaStrategyTest.cachingIsDisabledAtCorrectThreshold


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62095 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 01:00:01 +00:00
Alan Davis
d156901f44 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59113: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59084: MNT-10028: Editing online document is not displayed in "I'm Editing" (and similar) filters in Share.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62093 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:58:28 +00:00
Alan Davis
9043dd7a30 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59086: Fixed up the legacy avm test to use the correct source folder


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62092 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:57:40 +00:00
Alan Davis
d6d16285d9 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59040: Added AuthenticationBootstrapTest to the own JVM Category


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62079 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:47:23 +00:00
Alan Davis
75730e988f Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59033: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58999: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         58913: Fix MT ContentStore so that it cannot return a null store
          - It was dependent, for some reason, on a cluster-aware cache that would be prone to nulling
            but the code just assumed that if it tried to set the value a few times it would stick.
          - Fixed transaction demarcation so that a transaction is always present when using the store.
            This is not ideal but it is inherently a repo-aware component and therefore needs it
          - MNT-9806: Prevent post-transaction handlers from rendering threads unusable
          - MNT-10096: MT: AbstractTenantRoutingContentStore can return null list of stores
         Merged from DEV/DEREK/MNT-9806 r58833


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:45:50 +00:00
Alan Davis
015d229618 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59028: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58961: MNT-10059: Resurrect PublishingRestApiTest and PublishWebContentJbpmTest.
      In PublishingTestHelper.mockChannelType(String) was added: when(channelType.getTitle()).thenReturn(channelTypeId).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:41:59 +00:00
Alan Davis
6ccd948c48 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
59021: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58878: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58843: MNT-10137 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
         Added BeforeMoveNodePolicy binding to BeforeDeleteChildAssociationRuleTrigger to handle renames via move correctly.
         58645: ALF-12726 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
         Added a JUnit test to reproduce the issue.
         58670: MNT-10137 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
         Added an additional check to the test that reproduces the issue (does not pass).
         Added a test that uses NodeService to rename the node (passes).
         58675: MNT-10137 : Update of document.name during creation leads to execution of a content rule specified for deletion (outbound)
         Added fixes to the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62065 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:36:16 +00:00
Alan Davis
dd3140d1eb Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58916: Added a test to the own Jvm category


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62057 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:29:58 +00:00
Alan Davis
4d3653f388 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58915: Recategorised some tests which we know aren’t very nice to the Spring context, moved FTPServerTest back in from the cold.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:29:09 +00:00
Alan Davis
e26e7a70eb Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58887: BDE-195 Bring publishing tests back into their own JVM, hoping they are doing the mess with the Maven tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62055 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:28:17 +00:00
Alan Davis
cd02df033a Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58885: Tweaking the tests and handling null better


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62054 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:27:25 +00:00
Alan Davis
995821ee71 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58876: BDE-195 Fix tests in Maven
     Put FTPServerTest back into OwnJVM until MNT-10160 is fixed
     Put ThumbnailServiceImplTest back into OwnJVM too, as it is failing and seems to bring everything down
     Bring back RepositoryStartStopTest: this one is fine!


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62053 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:26:34 +00:00
Alan Davis
2b97211561 Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58853: The legacy category now only contains avm tests


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:23:24 +00:00
Alan Davis
d1ded43bbf Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58852: Recategorised some tests and test executions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62048 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:22:36 +00:00
Alan Davis
d6770deedc Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58840: BDE-195 Put ExporterComponentTest in its OwnJVM, it deals with locales in a funny way + stop trating LegacyCategory and BaseSpringTestsCategory separately, trying to get back to a sensible behaviour


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62047 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:21:48 +00:00
Alan Davis
5d0d4fb5ed Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)
58817: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      58784: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58617 : MNT-9711: ldap synchronization algorithm is not optimal
            - The verification for deleting permissions was added for the full synchronization.
            - The unit tests were modified according the new logic.
         58667 : MNT-9711: ldap synchronization algorithm is not optimal
            - Refactoring code. Removed unreachable code.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62038 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2014-02-12 00:14:46 +00:00
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
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
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